diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml index c7fd698..dc116fc 100644 --- a/.github/workflows/Tests.yml +++ b/.github/workflows/Tests.yml @@ -8,22 +8,25 @@ on: branches: - 'main' pull_request: - types: [assigned, opened, synchronize, reopened] + types: [opened, synchronize, reopened] jobs: build: strategy: matrix: os: [ ubuntu-latest, macos-latest, windows-latest ] - smalltalk: [ Pharo64-11, Pharo64-12 ] + smalltalk: [ Pharo64-11, Pharo64-12, Pharo64-13 ] runs-on: ${{ matrix.os }} name: ${{ matrix.smalltalk }} on ${{ matrix.os }} steps: - - uses: actions/checkout@v3 - - uses: hpi-swa/setup-smalltalkCI@v1 + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Setup smalltalkCI + uses: hpi-swa/setup-smalltalkCI@v1 with: smalltalk-image: ${{ matrix.smalltalk }} - - name: Load in New Image and Run Tests + - name: Load in new image and run tests run: smalltalkci -s ${{ matrix.smalltalk }} ${{ matrix.ston }} shell: bash - timeout-minutes: 15 \ No newline at end of file + timeout-minutes: 30 \ No newline at end of file diff --git a/.project b/.project index c4d6941..4ad9e77 100644 --- a/.project +++ b/.project @@ -1,3 +1,4 @@ { - 'srcDirectory' : '' + 'srcDirectory' : 'src', + 'tags' : [ #Laborde] } \ No newline at end of file diff --git a/.smalltalk.ston b/.smalltalk.ston index 1f5810b..c88959a 100644 --- a/.smalltalk.ston +++ b/.smalltalk.ston @@ -2,12 +2,14 @@ SmalltalkCISpec { #loading : [ SCIMetacelloLoadSpec { #baseline : 'Collectable', + #directory : 'src', + #onConflict : #useLoaded, + #onUpgrade : #useLoaded, + #onWarningLog : true, #platforms : [ #pharo ] } ], #testing : { - #include : { - #packages : [ 'Collectable*-Tests' ] - } + #packages : [ 'Collectable*-Tests' ] } } \ No newline at end of file diff --git a/LICENSE b/LICENSE index dbd9eee..e4a2b9a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023 Pierre Laborde +Copyright (c) 2023-2025 Pierre Laborde Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 3e99d22..06c82b1 100644 --- a/README.md +++ b/README.md @@ -13,18 +13,17 @@ ```smalltalk Metacello new repository: 'github://labordep/Collectable:main'; - baseline: 'Collectable' ; + baseline: 'Collectable'; + onConflictUseLoaded; load. ``` ## Dependencies -- [Toplo](https://github.com/plantec/Toplo) -- [Bloc](https://github.com/pharo-graphics/Bloc) -- [Pyramid](https://github.com/OpenSmock/Pyramid) - [Molecule](https://github.com/OpenSmock/Molecule) +- [Pyramid](https://github.com/OpenSmock/Pyramid) - [PharoGameye](https://github.com/labordep/PharoGameye) -- [OS-Windows](https://github.com/astares/Pharo-OS-Windows/src) +- [OS-Windows](https://github.com/OpenSmock/OS-Windows) ## License diff --git a/.properties b/src/.properties similarity index 100% rename from .properties rename to src/.properties diff --git a/BaselineOfCollectable/BaselineOfCollectable.class.st b/src/BaselineOfCollectable/BaselineOfCollectable.class.st similarity index 77% rename from BaselineOfCollectable/BaselineOfCollectable.class.st rename to src/BaselineOfCollectable/BaselineOfCollectable.class.st index 1b62879..360a4fd 100644 --- a/BaselineOfCollectable/BaselineOfCollectable.class.st +++ b/src/BaselineOfCollectable/BaselineOfCollectable.class.st @@ -30,23 +30,17 @@ BaselineOfCollectable >> baseline: spec [ { #category : #baselines } BaselineOfCollectable >> dependencies: spec [ - "Roassal stable version" - spec baseline: 'Roassal' with: [ spec repository: 'github://pharo-graphics/Roassal' ]. - "Functionnality to import Pharo Gameye datas" - spec baseline: 'Gameye' with: [ spec repository: 'github://labordep/PharoGameye:2.0.1' ]. + spec baseline: 'Gameye' with: [ spec repository: 'github://labordep/PharoGameye:2.0.3' ]. "OS-Windows management layer for the UI" Smalltalk os isWindows ifTrue: [ - spec baseline: 'OSWindows' with: [ spec repository: 'github://astares/Pharo-OS-Windows/src' ]. - - "OpenSmock OS-Windows extensions" spec baseline: 'OSWindowsOpenSmock' with: [ spec repository: 'github://OpenSmock/OS-Windows:main' ]. ]. - "UI tool : Pyramid - Pyramid already load Toplo (and Bloc of course)" - spec baseline: 'Pyramid' with: [ spec repository: 'github://OpenSmock/Pyramid:main/src' ]. + "UI editor: Pyramid" + spec baseline: 'Pyramid' with: [ spec repository: 'github://OpenSmock/Pyramid:main' ]. - "Architecture framework : Molecule" - spec baseline: 'Molecule' with: [ spec repository: 'github://OpenSmock/Molecule:1.2.12' ]. + "Component architecture framework: Molecule" + spec baseline: 'Molecule' with: [ spec repository: 'github://OpenSmock/Molecule:1.3.4' ]. ] diff --git a/BaselineOfCollectable/package.st b/src/BaselineOfCollectable/package.st similarity index 100% rename from BaselineOfCollectable/package.st rename to src/BaselineOfCollectable/package.st diff --git a/Collectable-Gameye-IDE/CollecWorld.extension.st b/src/Collectable-Gameye-IDE/CollecWorld.extension.st similarity index 100% rename from Collectable-Gameye-IDE/CollecWorld.extension.st rename to src/Collectable-Gameye-IDE/CollecWorld.extension.st diff --git a/Collectable-Gameye-IDE/package.st b/src/Collectable-Gameye-IDE/package.st similarity index 100% rename from Collectable-Gameye-IDE/package.st rename to src/Collectable-Gameye-IDE/package.st diff --git a/Collectable-Gameye-Tests/CollecGameyeUtilsTest.class.st b/src/Collectable-Gameye-Tests/CollecGameyeUtilsTest.class.st similarity index 100% rename from Collectable-Gameye-Tests/CollecGameyeUtilsTest.class.st rename to src/Collectable-Gameye-Tests/CollecGameyeUtilsTest.class.st diff --git a/Collectable-Gameye-Tests/GameyeVideoGameTest.extension.st b/src/Collectable-Gameye-Tests/GameyeVideoGameTest.extension.st similarity index 100% rename from Collectable-Gameye-Tests/GameyeVideoGameTest.extension.st rename to src/Collectable-Gameye-Tests/GameyeVideoGameTest.extension.st diff --git a/Collectable-Gameye-Tests/package.st b/src/Collectable-Gameye-Tests/package.st similarity index 100% rename from Collectable-Gameye-Tests/package.st rename to src/Collectable-Gameye-Tests/package.st diff --git a/Collectable-Gameye/CollecGameyeUtils.class.st b/src/Collectable-Gameye/CollecGameyeUtils.class.st similarity index 100% rename from Collectable-Gameye/CollecGameyeUtils.class.st rename to src/Collectable-Gameye/CollecGameyeUtils.class.st diff --git a/Collectable-Gameye/CollectableVideoGamePlatform.extension.st b/src/Collectable-Gameye/CollectableVideoGamePlatform.extension.st similarity index 100% rename from Collectable-Gameye/CollectableVideoGamePlatform.extension.st rename to src/Collectable-Gameye/CollectableVideoGamePlatform.extension.st diff --git a/Collectable-Gameye/CollectibleGameyePeripheral.class.st b/src/Collectable-Gameye/CollectibleGameyePeripheral.class.st similarity index 100% rename from Collectable-Gameye/CollectibleGameyePeripheral.class.st rename to src/Collectable-Gameye/CollectibleGameyePeripheral.class.st diff --git a/Collectable-Gameye/CollectibleGameyeSystem.class.st b/src/Collectable-Gameye/CollectibleGameyeSystem.class.st similarity index 100% rename from Collectable-Gameye/CollectibleGameyeSystem.class.st rename to src/Collectable-Gameye/CollectibleGameyeSystem.class.st diff --git a/Collectable-Gameye/CollectibleGameyeVideoGame.class.st b/src/Collectable-Gameye/CollectibleGameyeVideoGame.class.st similarity index 100% rename from Collectable-Gameye/CollectibleGameyeVideoGame.class.st rename to src/Collectable-Gameye/CollectibleGameyeVideoGame.class.st diff --git a/Collectable-Gameye/GameyePeripheral.extension.st b/src/Collectable-Gameye/GameyePeripheral.extension.st similarity index 100% rename from Collectable-Gameye/GameyePeripheral.extension.st rename to src/Collectable-Gameye/GameyePeripheral.extension.st diff --git a/Collectable-Gameye/GameyeSystem.extension.st b/src/Collectable-Gameye/GameyeSystem.extension.st similarity index 100% rename from Collectable-Gameye/GameyeSystem.extension.st rename to src/Collectable-Gameye/GameyeSystem.extension.st diff --git a/Collectable-Gameye/GameyeVideoGame.extension.st b/src/Collectable-Gameye/GameyeVideoGame.extension.st similarity index 100% rename from Collectable-Gameye/GameyeVideoGame.extension.st rename to src/Collectable-Gameye/GameyeVideoGame.extension.st diff --git a/Collectable-Gameye/TCollectibleGameyeCollectible.trait.st b/src/Collectable-Gameye/TCollectibleGameyeCollectible.trait.st similarity index 100% rename from Collectable-Gameye/TCollectibleGameyeCollectible.trait.st rename to src/Collectable-Gameye/TCollectibleGameyeCollectible.trait.st diff --git a/Collectable-Gameye/TCollectibleGameyePeripheral.trait.st b/src/Collectable-Gameye/TCollectibleGameyePeripheral.trait.st similarity index 100% rename from Collectable-Gameye/TCollectibleGameyePeripheral.trait.st rename to src/Collectable-Gameye/TCollectibleGameyePeripheral.trait.st diff --git a/Collectable-Gameye/TCollectibleGameyeSystem.trait.st b/src/Collectable-Gameye/TCollectibleGameyeSystem.trait.st similarity index 100% rename from Collectable-Gameye/TCollectibleGameyeSystem.trait.st rename to src/Collectable-Gameye/TCollectibleGameyeSystem.trait.st diff --git a/Collectable-Gameye/TCollectibleGameyeVideoGame.trait.st b/src/Collectable-Gameye/TCollectibleGameyeVideoGame.trait.st similarity index 100% rename from Collectable-Gameye/TCollectibleGameyeVideoGame.trait.st rename to src/Collectable-Gameye/TCollectibleGameyeVideoGame.trait.st diff --git a/Collectable-Gameye/package.st b/src/Collectable-Gameye/package.st similarity index 100% rename from Collectable-Gameye/package.st rename to src/Collectable-Gameye/package.st diff --git a/Collectable-IDE/CollecWorld.class.st b/src/Collectable-IDE/CollecWorld.class.st similarity index 100% rename from Collectable-IDE/CollecWorld.class.st rename to src/Collectable-IDE/CollecWorld.class.st diff --git a/Collectable-IDE/package.st b/src/Collectable-IDE/package.st similarity index 100% rename from Collectable-IDE/package.st rename to src/Collectable-IDE/package.st diff --git a/Collectable-Incubator/package.st b/src/Collectable-Incubator/package.st similarity index 100% rename from Collectable-Incubator/package.st rename to src/Collectable-Incubator/package.st diff --git a/Collectable-Tests/CollectibleCollectionTest.class.st b/src/Collectable-Tests/CollectibleCollectionTest.class.st similarity index 100% rename from Collectable-Tests/CollectibleCollectionTest.class.st rename to src/Collectable-Tests/CollectibleCollectionTest.class.st diff --git a/Collectable-Tests/CollectibleTest.class.st b/src/Collectable-Tests/CollectibleTest.class.st similarity index 100% rename from Collectable-Tests/CollectibleTest.class.st rename to src/Collectable-Tests/CollectibleTest.class.st diff --git a/Collectable-Tests/package.st b/src/Collectable-Tests/package.st similarity index 100% rename from Collectable-Tests/package.st rename to src/Collectable-Tests/package.st diff --git a/Collectable-VideoGames-Tests/CollectibleVideoGamePeripheralTest.class.st b/src/Collectable-VideoGames-Tests/CollectibleVideoGamePeripheralTest.class.st similarity index 100% rename from Collectable-VideoGames-Tests/CollectibleVideoGamePeripheralTest.class.st rename to src/Collectable-VideoGames-Tests/CollectibleVideoGamePeripheralTest.class.st diff --git a/Collectable-VideoGames-Tests/CollectibleVideoGameSystemTest.class.st b/src/Collectable-VideoGames-Tests/CollectibleVideoGameSystemTest.class.st similarity index 100% rename from Collectable-VideoGames-Tests/CollectibleVideoGameSystemTest.class.st rename to src/Collectable-VideoGames-Tests/CollectibleVideoGameSystemTest.class.st diff --git a/Collectable-VideoGames-Tests/CollectibleVideoGameTest.class.st b/src/Collectable-VideoGames-Tests/CollectibleVideoGameTest.class.st similarity index 100% rename from Collectable-VideoGames-Tests/CollectibleVideoGameTest.class.st rename to src/Collectable-VideoGames-Tests/CollectibleVideoGameTest.class.st diff --git a/Collectable-VideoGames-Tests/package.st b/src/Collectable-VideoGames-Tests/package.st similarity index 100% rename from Collectable-VideoGames-Tests/package.st rename to src/Collectable-VideoGames-Tests/package.st diff --git a/Collectable-VideoGames/CollectableVideoGameFullset.class.st b/src/Collectable-VideoGames/CollectableVideoGameFullset.class.st similarity index 100% rename from Collectable-VideoGames/CollectableVideoGameFullset.class.st rename to src/Collectable-VideoGames/CollectableVideoGameFullset.class.st diff --git a/Collectable-VideoGames/CollectableVideoGameFullsetStatView.class.st b/src/Collectable-VideoGames/CollectableVideoGameFullsetStatView.class.st similarity index 100% rename from Collectable-VideoGames/CollectableVideoGameFullsetStatView.class.st rename to src/Collectable-VideoGames/CollectableVideoGameFullsetStatView.class.st diff --git a/Collectable-VideoGames/CollectableVideoGamePlatform.class.st b/src/Collectable-VideoGames/CollectableVideoGamePlatform.class.st similarity index 100% rename from Collectable-VideoGames/CollectableVideoGamePlatform.class.st rename to src/Collectable-VideoGames/CollectableVideoGamePlatform.class.st diff --git a/Collectable-VideoGames/CollectableVideoGamesCatalogs.class.st b/src/Collectable-VideoGames/CollectableVideoGamesCatalogs.class.st similarity index 100% rename from Collectable-VideoGames/CollectableVideoGamesCatalogs.class.st rename to src/Collectable-VideoGames/CollectableVideoGamesCatalogs.class.st diff --git a/Collectable-VideoGames/CollectableVideoGamesUIUtils.class.st b/src/Collectable-VideoGames/CollectableVideoGamesUIUtils.class.st similarity index 100% rename from Collectable-VideoGames/CollectableVideoGamesUIUtils.class.st rename to src/Collectable-VideoGames/CollectableVideoGamesUIUtils.class.st diff --git a/Collectable-VideoGames/CollectibleVideoGame.class.st b/src/Collectable-VideoGames/CollectibleVideoGame.class.st similarity index 100% rename from Collectable-VideoGames/CollectibleVideoGame.class.st rename to src/Collectable-VideoGames/CollectibleVideoGame.class.st diff --git a/Collectable-VideoGames/CollectibleVideoGameCompletion.class.st b/src/Collectable-VideoGames/CollectibleVideoGameCompletion.class.st similarity index 100% rename from Collectable-VideoGames/CollectibleVideoGameCompletion.class.st rename to src/Collectable-VideoGames/CollectibleVideoGameCompletion.class.st diff --git a/Collectable-VideoGames/CollectibleVideoGamePeripheral.class.st b/src/Collectable-VideoGames/CollectibleVideoGamePeripheral.class.st similarity index 100% rename from Collectable-VideoGames/CollectibleVideoGamePeripheral.class.st rename to src/Collectable-VideoGames/CollectibleVideoGamePeripheral.class.st diff --git a/Collectable-VideoGames/CollectibleVideoGameSystem.class.st b/src/Collectable-VideoGames/CollectibleVideoGameSystem.class.st similarity index 100% rename from Collectable-VideoGames/CollectibleVideoGameSystem.class.st rename to src/Collectable-VideoGames/CollectibleVideoGameSystem.class.st diff --git a/Collectable-VideoGames/package.st b/src/Collectable-VideoGames/package.st similarity index 100% rename from Collectable-VideoGames/package.st rename to src/Collectable-VideoGames/package.st diff --git a/Collectable/CollecOSProjectManagerType.trait.st b/src/Collectable/CollecOSProjectManagerType.trait.st similarity index 100% rename from Collectable/CollecOSProjectManagerType.trait.st rename to src/Collectable/CollecOSProjectManagerType.trait.st diff --git a/Collectable/CollectOSPharoManager.class.st b/src/Collectable/CollectOSPharoManager.class.st similarity index 100% rename from Collectable/CollectOSPharoManager.class.st rename to src/Collectable/CollectOSPharoManager.class.st diff --git a/Collectable/CollectOSProjectManagerServices.trait.st b/src/Collectable/CollectOSProjectManagerServices.trait.st similarity index 100% rename from Collectable/CollectOSProjectManagerServices.trait.st rename to src/Collectable/CollectOSProjectManagerServices.trait.st diff --git a/Collectable/CollectOSWindowsManager.class.st b/src/Collectable/CollectOSWindowsManager.class.st similarity index 100% rename from Collectable/CollectOSWindowsManager.class.st rename to src/Collectable/CollectOSWindowsManager.class.st diff --git a/Collectable/Collectable.class.st b/src/Collectable/Collectable.class.st similarity index 100% rename from Collectable/Collectable.class.st rename to src/Collectable/Collectable.class.st diff --git a/Collectable/CollectableApp.trait.st b/src/Collectable/CollectableApp.trait.st similarity index 100% rename from Collectable/CollectableApp.trait.st rename to src/Collectable/CollectableApp.trait.st diff --git a/Collectable/CollectableAppImpl.class.st b/src/Collectable/CollectableAppImpl.class.st similarity index 100% rename from Collectable/CollectableAppImpl.class.st rename to src/Collectable/CollectableAppImpl.class.st diff --git a/Collectable/CollectableCollectionsManager.trait.st b/src/Collectable/CollectableCollectionsManager.trait.st similarity index 100% rename from Collectable/CollectableCollectionsManager.trait.st rename to src/Collectable/CollectableCollectionsManager.trait.st diff --git a/Collectable/CollectableCollectionsManagerEvents.trait.st b/src/Collectable/CollectableCollectionsManagerEvents.trait.st similarity index 100% rename from Collectable/CollectableCollectionsManagerEvents.trait.st rename to src/Collectable/CollectableCollectionsManagerEvents.trait.st diff --git a/Collectable/CollectableCollectionsManagerImpl.class.st b/src/Collectable/CollectableCollectionsManagerImpl.class.st similarity index 100% rename from Collectable/CollectableCollectionsManagerImpl.class.st rename to src/Collectable/CollectableCollectionsManagerImpl.class.st diff --git a/Collectable/CollectableCollectionsManagerServices.trait.st b/src/Collectable/CollectableCollectionsManagerServices.trait.st similarity index 100% rename from Collectable/CollectableCollectionsManagerServices.trait.st rename to src/Collectable/CollectableCollectionsManagerServices.trait.st diff --git a/Collectable/CollectableFullset.class.st b/src/Collectable/CollectableFullset.class.st similarity index 100% rename from Collectable/CollectableFullset.class.st rename to src/Collectable/CollectableFullset.class.st diff --git a/Collectable/CollectablePlatform.class.st b/src/Collectable/CollectablePlatform.class.st similarity index 100% rename from Collectable/CollectablePlatform.class.st rename to src/Collectable/CollectablePlatform.class.st diff --git a/Collectable/CollectablePricesStatView.class.st b/src/Collectable/CollectablePricesStatView.class.st similarity index 100% rename from Collectable/CollectablePricesStatView.class.st rename to src/Collectable/CollectablePricesStatView.class.st diff --git a/Collectable/CollectableTVRegion.class.st b/src/Collectable/CollectableTVRegion.class.st similarity index 100% rename from Collectable/CollectableTVRegion.class.st rename to src/Collectable/CollectableTVRegion.class.st diff --git a/Collectable/CollectableUserdatas.class.st b/src/Collectable/CollectableUserdatas.class.st similarity index 100% rename from Collectable/CollectableUserdatas.class.st rename to src/Collectable/CollectableUserdatas.class.st diff --git a/Collectable/CollectableView.trait.st b/src/Collectable/CollectableView.trait.st similarity index 100% rename from Collectable/CollectableView.trait.st rename to src/Collectable/CollectableView.trait.st diff --git a/Collectable/CollectableViewEvents.trait.st b/src/Collectable/CollectableViewEvents.trait.st similarity index 100% rename from Collectable/CollectableViewEvents.trait.st rename to src/Collectable/CollectableViewEvents.trait.st diff --git a/Collectable/CollectableViewServices.trait.st b/src/Collectable/CollectableViewServices.trait.st similarity index 100% rename from Collectable/CollectableViewServices.trait.st rename to src/Collectable/CollectableViewServices.trait.st diff --git a/Collectable/Collectible.class.st b/src/Collectable/Collectible.class.st similarity index 100% rename from Collectable/Collectible.class.st rename to src/Collectable/Collectible.class.st diff --git a/Collectable/CollectibleCatalog.class.st b/src/Collectable/CollectibleCatalog.class.st similarity index 100% rename from Collectable/CollectibleCatalog.class.st rename to src/Collectable/CollectibleCatalog.class.st diff --git a/Collectable/CollectibleCollection.class.st b/src/Collectable/CollectibleCollection.class.st similarity index 100% rename from Collectable/CollectibleCollection.class.st rename to src/Collectable/CollectibleCollection.class.st diff --git a/Collectable/CollectibleCompletion.class.st b/src/Collectable/CollectibleCompletion.class.st similarity index 100% rename from Collectable/CollectibleCompletion.class.st rename to src/Collectable/CollectibleCompletion.class.st diff --git a/Collectable/MolUtils.extension.st b/src/Collectable/MolUtils.extension.st similarity index 100% rename from Collectable/MolUtils.extension.st rename to src/Collectable/MolUtils.extension.st diff --git a/Collectable/TCollectible.trait.st b/src/Collectable/TCollectible.trait.st similarity index 100% rename from Collectable/TCollectible.trait.st rename to src/Collectable/TCollectible.trait.st diff --git a/Collectable/TCollectibleBelongPlatform.trait.st b/src/Collectable/TCollectibleBelongPlatform.trait.st similarity index 100% rename from Collectable/TCollectibleBelongPlatform.trait.st rename to src/Collectable/TCollectibleBelongPlatform.trait.st diff --git a/Collectable/TCollectibleCollection.trait.st b/src/Collectable/TCollectibleCollection.trait.st similarity index 100% rename from Collectable/TCollectibleCollection.trait.st rename to src/Collectable/TCollectibleCollection.trait.st diff --git a/Collectable/TCollectibleCompletion.trait.st b/src/Collectable/TCollectibleCompletion.trait.st similarity index 100% rename from Collectable/TCollectibleCompletion.trait.st rename to src/Collectable/TCollectibleCompletion.trait.st diff --git a/Collectable/TCollectibleCompletionHaveBox.trait.st b/src/Collectable/TCollectibleCompletionHaveBox.trait.st similarity index 100% rename from Collectable/TCollectibleCompletionHaveBox.trait.st rename to src/Collectable/TCollectibleCompletionHaveBox.trait.st diff --git a/Collectable/TCollectibleCompletionHaveManual.trait.st b/src/Collectable/TCollectibleCompletionHaveManual.trait.st similarity index 100% rename from Collectable/TCollectibleCompletionHaveManual.trait.st rename to src/Collectable/TCollectibleCompletionHaveManual.trait.st diff --git a/Collectable/TCollectibleCompletionHaveSupport.trait.st b/src/Collectable/TCollectibleCompletionHaveSupport.trait.st similarity index 100% rename from Collectable/TCollectibleCompletionHaveSupport.trait.st rename to src/Collectable/TCollectibleCompletionHaveSupport.trait.st diff --git a/Collectable/TCollectibleDelegator.trait.st b/src/Collectable/TCollectibleDelegator.trait.st similarity index 100% rename from Collectable/TCollectibleDelegator.trait.st rename to src/Collectable/TCollectibleDelegator.trait.st diff --git a/Collectable/TCollectibleHaveCompletion.trait.st b/src/Collectable/TCollectibleHaveCompletion.trait.st similarity index 100% rename from Collectable/TCollectibleHaveCompletion.trait.st rename to src/Collectable/TCollectibleHaveCompletion.trait.st diff --git a/Collectable/TCollectibleHaveCountry.trait.st b/src/Collectable/TCollectibleHaveCountry.trait.st similarity index 100% rename from Collectable/TCollectibleHaveCountry.trait.st rename to src/Collectable/TCollectibleHaveCountry.trait.st diff --git a/Collectable/TCollectibleHaveDeveloper.trait.st b/src/Collectable/TCollectibleHaveDeveloper.trait.st similarity index 100% rename from Collectable/TCollectibleHaveDeveloper.trait.st rename to src/Collectable/TCollectibleHaveDeveloper.trait.st diff --git a/Collectable/TCollectibleHavePublisher.trait.st b/src/Collectable/TCollectibleHavePublisher.trait.st similarity index 100% rename from Collectable/TCollectibleHavePublisher.trait.st rename to src/Collectable/TCollectibleHavePublisher.trait.st diff --git a/Collectable/TCollectibleHaveTVRegion.trait.st b/src/Collectable/TCollectibleHaveTVRegion.trait.st similarity index 100% rename from Collectable/TCollectibleHaveTVRegion.trait.st rename to src/Collectable/TCollectibleHaveTVRegion.trait.st diff --git a/Collectable/package.st b/src/Collectable/package.st similarity index 100% rename from Collectable/package.st rename to src/Collectable/package.st