diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7cc2f541..2b511f72 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -178,7 +178,7 @@ jobs: - name: Install fakealpm dependencies uses: awalsh128/cache-apt-pkgs-action@v1.4.2 with: - packages: libarchive-dev libalpm-dev gcc cmake ninja-build libboost-dev nlohmann-json3-dev + packages: libarchive-dev libalpm-dev gcc cmake ninja-build libboost-all-dev nlohmann-json3-dev - name: Build fakelpm - run: ./installer/pacman/fakealpm/build.sh installer/pacman/fakealpm/ installer/pacman/fakealpm/build/ /usr/local + run: ./src/installer/pacman/fakealpm/build.sh src/installer/pacman/fakealpm/ build/fakealpm/ /usr/local diff --git a/Dockerfile b/Dockerfile index 9672dc2d..23f175cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ RUN pacman --noconfirm -S ninja RUN pacman --noconfirm -S boost RUN pacman --noconfirm -S nlohmann-json -COPY installer/pacman/fakealpm/ /workdir/fakealpm +COPY src/installer/pacman/fakealpm/ /workdir/fakealpm RUN ./fakealpm/build.sh fakealpm/ fakealpm/build/ /usr/local # ----------------------------------------------------------------------------- @@ -34,45 +34,45 @@ RUN pip install --upgrade pip FROM base-python AS updater -COPY utils/async/ /workdir/utils/async +COPY src/utils/async/ /workdir/utils/async RUN pip install utils/async -COPY repository-driver/interface/ /workdir/repository-driver/interface +COPY src/repository-driver/interface/ /workdir/repository-driver/interface RUN pip install repository-driver/interface/ -COPY utils/json /workdir/utils/json +COPY src/utils/json /workdir/utils/json RUN pip install utils/json -COPY utils/cli /workdir/utils/cli +COPY src/utils/cli /workdir/utils/cli RUN pip install utils/cli -COPY utils/python /workdir/utils/python +COPY src/utils/python /workdir/utils/python RUN pip install utils/python -COPY repository-driver/update/ /workdir/repository-driver/update +COPY src/repository-driver/update/ /workdir/repository-driver/update RUN pip install repository-driver/update/ -COPY utils/file/ /workdir/utils/file +COPY src/utils/file/ /workdir/utils/file RUN pip install utils/file -COPY utils/lock/ /workdir/utils/lock +COPY src/utils/lock/ /workdir/utils/lock RUN pip install utils/lock -COPY repository-driver/pacman/ /workdir/repository-driver/pacman +COPY src/repository-driver/pacman/ /workdir/repository-driver/pacman RUN pip install repository-driver/pacman/ -COPY repository-driver/AUR/ /workdir/repository-driver/AUR +COPY src/repository-driver/AUR/ /workdir/repository-driver/AUR RUN pip install repository-driver/AUR/ -COPY repository-driver/conan/ /workdir/repository-driver/conan +COPY src/repository-driver/conan/ /workdir/repository-driver/conan RUN pip install repository-driver/conan/ @@ -101,7 +101,7 @@ RUN pacman --noconfirm -S jdk-openjdk COPY --from=sat4j /workdir/sat4j/ /workdir/sat4j -COPY solver/ /workdir/solver +COPY src/solver/ /workdir/solver RUN javac -classpath /workdir/sat4j/org.sat4j.core.jar /workdir/solver/Solver.java @@ -116,77 +116,77 @@ ARG USER=root COPY --from=fakealpm /usr/local/bin/fakealpm /usr/local/bin/fakealpm COPY --from=fakealpm /usr/local/bin/fakealpm-executable /usr/local/bin/fakealpm-executable -COPY utils/json /workdir/utils/json +COPY src/utils/json /workdir/utils/json RUN pip install utils/json -COPY utils/async /workdir/utils/async +COPY src/utils/async /workdir/utils/async RUN pip install utils/async -COPY utils/cli /workdir/utils/cli +COPY src/utils/cli /workdir/utils/cli RUN pip install utils/cli -COPY utils/container /workdir/utils/container +COPY src/utils/container /workdir/utils/container RUN pip install utils/container -COPY utils/file /workdir/utils/file +COPY src/utils/file /workdir/utils/file RUN pip install utils/file -COPY utils/lock /workdir/utils/lock +COPY src/utils/lock /workdir/utils/lock RUN pip install utils/lock -COPY utils/python /workdir/utils/python +COPY src/utils/python /workdir/utils/python RUN pip install utils/python -COPY utils/serialization /workdir/utils/serialization +COPY src/utils/serialization /workdir/utils/serialization RUN pip install utils/serialization -COPY repository-driver/interface/ /workdir/repository-driver/interface +COPY src/repository-driver/interface/ /workdir/repository-driver/interface RUN pip install repository-driver/interface/ -COPY repository-driver/pacman/ /workdir/repository-driver/pacman +COPY src/repository-driver/pacman/ /workdir/repository-driver/pacman RUN pip install repository-driver/pacman/ -COPY repository-driver/AUR/ /workdir/repository-driver/AUR +COPY src/repository-driver/AUR/ /workdir/repository-driver/AUR RUN pip install repository-driver/AUR/ -COPY repository-driver/conan/ /workdir/repository-driver/conan +COPY src/repository-driver/conan/ /workdir/repository-driver/conan RUN pip install repository-driver/conan/ -COPY translator/interface/ /workdir/translator/interface +COPY src/translator/interface/ /workdir/translator/interface RUN pip install translator/interface/ -COPY translator/pacman/ /workdir/translator/pacman +COPY src/translator/pacman/ /workdir/translator/pacman RUN pip install translator/pacman/ -COPY translator/conan/ /workdir/translator/conan +COPY src/translator/conan/ /workdir/translator/conan RUN pip install translator/conan/ -COPY installer/interface/ /workdir/installer/interface +COPY src/installer/interface/ /workdir/installer/interface RUN pip install installer/interface/ -COPY installer/pacman/ /workdir/installer/pacman +COPY src/installer/pacman/ /workdir/installer/pacman RUN pip install installer/pacman/ -COPY installer/conan/ /workdir/installer/conan +COPY src/installer/conan/ /workdir/installer/conan RUN pip install installer/conan/ -COPY generator/interface/ /workdir/generator/interface +COPY src/generator/interface/ /workdir/generator/interface RUN pip install generator/interface/ -COPY generator/conan/ /workdir/generator/conan +COPY src/generator/conan/ /workdir/generator/conan RUN pip install generator/conan/ -COPY metamanager/ /workdir/metamanager +COPY src/metamanager/ /workdir/metamanager RUN pip install metamanager/ ENTRYPOINT [ "python", "-m", "PPpackage.metamanager" ] diff --git a/README.md b/README.md index 70f940f8..3efb1de2 100644 --- a/README.md +++ b/README.md @@ -349,7 +349,7 @@ All examples use config `unix://$XDG_RUNTIME_DIR/podman/podman.sock` for the con The SAT solver the meta-manager uses is invoked as a container. Therefore the image for the solver needs to be built. ```bash -./solver/image-build.sh $containerizer +./image-build.sh $containerizer solver ``` #### Native invocation @@ -399,7 +399,8 @@ WARNING: `docker-compose` 1.X is not compatible. Use version 2.X. It is *optional* to build the images yourself. They are hosted on [dockerhub](https://hub.docker.com/). ```bash -./images-build.sh $containerizer +./image-build.sh $containerizer metamanager +./image-build.sh $containerizer updater ``` Docker requires more configuration because of how diff --git a/image-build.sh b/image-build.sh new file mode 100755 index 00000000..c90aceb2 --- /dev/null +++ b/image-build.sh @@ -0,0 +1,13 @@ +usage="Usage: $0 [docker | podman] [solver | metamanager | updater]" + +if [ -z "$1" ] || ([ "$1" != "docker" ] && [ "$1" != "podman" ]); then + echo "$usage" + exit 1 +fi + +if [ -z "$2" ] || ([ "$2" != "solver" ] && [ "$2" != "metamanager" ] && [ "$2" != "updater" ]); then + echo "$usage" + exit 2 +fi + +"$1" build --target "$2" --tag "docker.io/fackop/pppackage-$2:latest" . diff --git a/images-build.sh b/images-build.sh deleted file mode 100755 index 582da011..00000000 --- a/images-build.sh +++ /dev/null @@ -1,8 +0,0 @@ -if [ -z "$1" ] || ([ "$1" != "docker" ] && [ "$1" != "podman" ]); then - echo "Usage: $0 [docker | podman]" - exit 1 -fi - -./solver/image-build.sh "$1" && \ -"$1" build --target updater --tag docker.io/fackop/pppackage-updater:latest . && \ -"$1" build --target metamanager --tag docker.io/fackop/pppackage-metamanager:latest . diff --git a/requirements-dev.txt b/requirements-dev.txt index dba836c3..375b5381 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,45 +2,45 @@ pre-commit hypercorn setuptools --e ./utils/json --config-settings editable_mode=compat --e ./utils/async --config-settings editable_mode=compat --e ./utils/cli --config-settings editable_mode=compat --e ./utils/container --config-settings editable_mode=compat --e ./utils/file --config-settings editable_mode=compat --e ./utils/lock --config-settings editable_mode=compat --e ./utils/python --config-settings editable_mode=compat --e ./utils/serialization --config-settings editable_mode=compat +-e ./src/utils/json --config-settings editable_mode=compat +-e ./src/utils/async --config-settings editable_mode=compat +-e ./src/utils/cli --config-settings editable_mode=compat +-e ./src/utils/container --config-settings editable_mode=compat +-e ./src/utils/file --config-settings editable_mode=compat +-e ./src/utils/lock --config-settings editable_mode=compat +-e ./src/utils/python --config-settings editable_mode=compat +-e ./src/utils/serialization --config-settings editable_mode=compat --e ./repository-driver/interface/ --config-settings editable_mode=compat +-e ./src/repository-driver/interface/ --config-settings editable_mode=compat --e ./repository-driver/update/ +-e ./src/repository-driver/update/ --e ./repository-driver/conan/ --e ./repository-driver/pacman/ --e ./repository-driver/AUR/ +-e ./src/repository-driver/conan/ +-e ./src/repository-driver/pacman/ +-e ./src/repository-driver/AUR/ --e ./installer/interface/ --config-settings editable_mode=compat +-e ./src/installer/interface/ --config-settings editable_mode=compat --e ./installer/pacman/ --e ./installer/conan/ +-e ./src/installer/pacman/ +-e ./src/installer/conan/ --e ./translator/interface/ --config-settings editable_mode=compat +-e ./src/translator/interface/ --config-settings editable_mode=compat --e ./translator/pacman/ --e ./translator/conan/ +-e ./src/translator/pacman/ +-e ./src/translator/conan/ --e ./generator/interface/ --config-settings editable_mode=compat +-e ./src/generator/interface/ --config-settings editable_mode=compat --e ./generator/conan/ +-e ./src/generator/conan/ --e ./metamanager/ +-e ./src/metamanager/ diff --git a/solver/image-build.sh b/solver/image-build.sh deleted file mode 100755 index 98b49939..00000000 --- a/solver/image-build.sh +++ /dev/null @@ -1,6 +0,0 @@ -if [ -z "$1" ] || ([ "$1" != "docker" ] && [ "$1" != "podman" ]); then - echo "Usage: $0 [docker | podman]" - exit 1 -fi - -"$1" build --target solver --tag docker.io/fackop/pppackage-solver:latest . diff --git a/generator/conan/PPpackage/generator/conan/__init__.py b/src/generator/conan/PPpackage/generator/conan/__init__.py similarity index 100% rename from generator/conan/PPpackage/generator/conan/__init__.py rename to src/generator/conan/PPpackage/generator/conan/__init__.py diff --git a/generator/conan/PPpackage/generator/conan/generate.py b/src/generator/conan/PPpackage/generator/conan/generate.py similarity index 100% rename from generator/conan/PPpackage/generator/conan/generate.py rename to src/generator/conan/PPpackage/generator/conan/generate.py diff --git a/generator/conan/PPpackage/generator/conan/interface.py b/src/generator/conan/PPpackage/generator/conan/interface.py similarity index 100% rename from generator/conan/PPpackage/generator/conan/interface.py rename to src/generator/conan/PPpackage/generator/conan/interface.py diff --git a/generator/conan/PPpackage/generator/conan/schemes.py b/src/generator/conan/PPpackage/generator/conan/schemes.py similarity index 100% rename from generator/conan/PPpackage/generator/conan/schemes.py rename to src/generator/conan/PPpackage/generator/conan/schemes.py diff --git a/generator/conan/setup.py b/src/generator/conan/setup.py similarity index 100% rename from generator/conan/setup.py rename to src/generator/conan/setup.py diff --git a/generator/interface/PPpackage/generator/interface/__init__.py b/src/generator/interface/PPpackage/generator/interface/__init__.py similarity index 100% rename from generator/interface/PPpackage/generator/interface/__init__.py rename to src/generator/interface/PPpackage/generator/interface/__init__.py diff --git a/generator/interface/PPpackage/generator/interface/interface.py b/src/generator/interface/PPpackage/generator/interface/interface.py similarity index 100% rename from generator/interface/PPpackage/generator/interface/interface.py rename to src/generator/interface/PPpackage/generator/interface/interface.py diff --git a/generator/interface/setup.py b/src/generator/interface/setup.py similarity index 100% rename from generator/interface/setup.py rename to src/generator/interface/setup.py diff --git a/installer/conan/PPpackage/installer/conan/__init__.py b/src/installer/conan/PPpackage/installer/conan/__init__.py similarity index 100% rename from installer/conan/PPpackage/installer/conan/__init__.py rename to src/installer/conan/PPpackage/installer/conan/__init__.py diff --git a/installer/conan/PPpackage/installer/conan/install.py b/src/installer/conan/PPpackage/installer/conan/install.py similarity index 100% rename from installer/conan/PPpackage/installer/conan/install.py rename to src/installer/conan/PPpackage/installer/conan/install.py diff --git a/installer/conan/PPpackage/installer/conan/interface.py b/src/installer/conan/PPpackage/installer/conan/interface.py similarity index 100% rename from installer/conan/PPpackage/installer/conan/interface.py rename to src/installer/conan/PPpackage/installer/conan/interface.py diff --git a/installer/conan/PPpackage/installer/conan/schemes.py b/src/installer/conan/PPpackage/installer/conan/schemes.py similarity index 100% rename from installer/conan/PPpackage/installer/conan/schemes.py rename to src/installer/conan/PPpackage/installer/conan/schemes.py diff --git a/installer/conan/setup.py b/src/installer/conan/setup.py similarity index 100% rename from installer/conan/setup.py rename to src/installer/conan/setup.py diff --git a/installer/interface/PPpackage/installer/interface/__init__.py b/src/installer/interface/PPpackage/installer/interface/__init__.py similarity index 100% rename from installer/interface/PPpackage/installer/interface/__init__.py rename to src/installer/interface/PPpackage/installer/interface/__init__.py diff --git a/installer/interface/PPpackage/installer/interface/exceptions.py b/src/installer/interface/PPpackage/installer/interface/exceptions.py similarity index 100% rename from installer/interface/PPpackage/installer/interface/exceptions.py rename to src/installer/interface/PPpackage/installer/interface/exceptions.py diff --git a/installer/interface/PPpackage/installer/interface/interface.py b/src/installer/interface/PPpackage/installer/interface/interface.py similarity index 100% rename from installer/interface/PPpackage/installer/interface/interface.py rename to src/installer/interface/PPpackage/installer/interface/interface.py diff --git a/installer/interface/setup.py b/src/installer/interface/setup.py similarity index 100% rename from installer/interface/setup.py rename to src/installer/interface/setup.py diff --git a/installer/pacman/PPpackage/installer/pacman/__init__.py b/src/installer/pacman/PPpackage/installer/pacman/__init__.py similarity index 100% rename from installer/pacman/PPpackage/installer/pacman/__init__.py rename to src/installer/pacman/PPpackage/installer/pacman/__init__.py diff --git a/installer/pacman/PPpackage/installer/pacman/install.py b/src/installer/pacman/PPpackage/installer/pacman/install.py similarity index 100% rename from installer/pacman/PPpackage/installer/pacman/install.py rename to src/installer/pacman/PPpackage/installer/pacman/install.py diff --git a/installer/pacman/PPpackage/installer/pacman/interface.py b/src/installer/pacman/PPpackage/installer/pacman/interface.py similarity index 100% rename from installer/pacman/PPpackage/installer/pacman/interface.py rename to src/installer/pacman/PPpackage/installer/pacman/interface.py diff --git a/installer/pacman/PPpackage/installer/pacman/schemes.py b/src/installer/pacman/PPpackage/installer/pacman/schemes.py similarity index 100% rename from installer/pacman/PPpackage/installer/pacman/schemes.py rename to src/installer/pacman/PPpackage/installer/pacman/schemes.py diff --git a/installer/pacman/fakealpm/CMakeLists.txt b/src/installer/pacman/fakealpm/CMakeLists.txt similarity index 100% rename from installer/pacman/fakealpm/CMakeLists.txt rename to src/installer/pacman/fakealpm/CMakeLists.txt diff --git a/installer/pacman/fakealpm/build.sh b/src/installer/pacman/fakealpm/build.sh similarity index 100% rename from installer/pacman/fakealpm/build.sh rename to src/installer/pacman/fakealpm/build.sh diff --git a/installer/pacman/fakealpm/executable.cpp b/src/installer/pacman/fakealpm/executable.cpp similarity index 100% rename from installer/pacman/fakealpm/executable.cpp rename to src/installer/pacman/fakealpm/executable.cpp diff --git a/installer/pacman/fakealpm/fakealpm.cpp b/src/installer/pacman/fakealpm/fakealpm.cpp similarity index 100% rename from installer/pacman/fakealpm/fakealpm.cpp rename to src/installer/pacman/fakealpm/fakealpm.cpp diff --git a/installer/pacman/setup.py b/src/installer/pacman/setup.py similarity index 100% rename from installer/pacman/setup.py rename to src/installer/pacman/setup.py diff --git a/metamanager/PPpackage/metamanager/__init__.py b/src/metamanager/PPpackage/metamanager/__init__.py similarity index 100% rename from metamanager/PPpackage/metamanager/__init__.py rename to src/metamanager/PPpackage/metamanager/__init__.py diff --git a/metamanager/PPpackage/metamanager/__main__.py b/src/metamanager/PPpackage/metamanager/__main__.py similarity index 100% rename from metamanager/PPpackage/metamanager/__main__.py rename to src/metamanager/PPpackage/metamanager/__main__.py diff --git a/metamanager/PPpackage/metamanager/build_formula.py b/src/metamanager/PPpackage/metamanager/build_formula.py similarity index 100% rename from metamanager/PPpackage/metamanager/build_formula.py rename to src/metamanager/PPpackage/metamanager/build_formula.py diff --git a/metamanager/PPpackage/metamanager/create_graph.py b/src/metamanager/PPpackage/metamanager/create_graph.py similarity index 100% rename from metamanager/PPpackage/metamanager/create_graph.py rename to src/metamanager/PPpackage/metamanager/create_graph.py diff --git a/metamanager/PPpackage/metamanager/exceptions.py b/src/metamanager/PPpackage/metamanager/exceptions.py similarity index 100% rename from metamanager/PPpackage/metamanager/exceptions.py rename to src/metamanager/PPpackage/metamanager/exceptions.py diff --git a/metamanager/PPpackage/metamanager/fetch/__init__.py b/src/metamanager/PPpackage/metamanager/fetch/__init__.py similarity index 100% rename from metamanager/PPpackage/metamanager/fetch/__init__.py rename to src/metamanager/PPpackage/metamanager/fetch/__init__.py diff --git a/metamanager/PPpackage/metamanager/fetch/archive.py b/src/metamanager/PPpackage/metamanager/fetch/archive.py similarity index 100% rename from metamanager/PPpackage/metamanager/fetch/archive.py rename to src/metamanager/PPpackage/metamanager/fetch/archive.py diff --git a/metamanager/PPpackage/metamanager/fetch/meta.py b/src/metamanager/PPpackage/metamanager/fetch/meta.py similarity index 100% rename from metamanager/PPpackage/metamanager/fetch/meta.py rename to src/metamanager/PPpackage/metamanager/fetch/meta.py diff --git a/metamanager/PPpackage/metamanager/fetch_and_install.py b/src/metamanager/PPpackage/metamanager/fetch_and_install.py similarity index 100% rename from metamanager/PPpackage/metamanager/fetch_and_install.py rename to src/metamanager/PPpackage/metamanager/fetch_and_install.py diff --git a/metamanager/PPpackage/metamanager/generate.py b/src/metamanager/PPpackage/metamanager/generate.py similarity index 100% rename from metamanager/PPpackage/metamanager/generate.py rename to src/metamanager/PPpackage/metamanager/generate.py diff --git a/metamanager/PPpackage/metamanager/generator.py b/src/metamanager/PPpackage/metamanager/generator.py similarity index 100% rename from metamanager/PPpackage/metamanager/generator.py rename to src/metamanager/PPpackage/metamanager/generator.py diff --git a/metamanager/PPpackage/metamanager/graph.py b/src/metamanager/PPpackage/metamanager/graph.py similarity index 100% rename from metamanager/PPpackage/metamanager/graph.py rename to src/metamanager/PPpackage/metamanager/graph.py diff --git a/metamanager/PPpackage/metamanager/install.py b/src/metamanager/PPpackage/metamanager/install.py similarity index 100% rename from metamanager/PPpackage/metamanager/install.py rename to src/metamanager/PPpackage/metamanager/install.py diff --git a/metamanager/PPpackage/metamanager/installer.py b/src/metamanager/PPpackage/metamanager/installer.py similarity index 100% rename from metamanager/PPpackage/metamanager/installer.py rename to src/metamanager/PPpackage/metamanager/installer.py diff --git a/metamanager/PPpackage/metamanager/main.py b/src/metamanager/PPpackage/metamanager/main.py similarity index 100% rename from metamanager/PPpackage/metamanager/main.py rename to src/metamanager/PPpackage/metamanager/main.py diff --git a/metamanager/PPpackage/metamanager/repository/__init__.py b/src/metamanager/PPpackage/metamanager/repository/__init__.py similarity index 100% rename from metamanager/PPpackage/metamanager/repository/__init__.py rename to src/metamanager/PPpackage/metamanager/repository/__init__.py diff --git a/metamanager/PPpackage/metamanager/repository/interface.py b/src/metamanager/PPpackage/metamanager/repository/interface.py similarity index 100% rename from metamanager/PPpackage/metamanager/repository/interface.py rename to src/metamanager/PPpackage/metamanager/repository/interface.py diff --git a/metamanager/PPpackage/metamanager/repository/local.py b/src/metamanager/PPpackage/metamanager/repository/local.py similarity index 100% rename from metamanager/PPpackage/metamanager/repository/local.py rename to src/metamanager/PPpackage/metamanager/repository/local.py diff --git a/metamanager/PPpackage/metamanager/resolve.py b/src/metamanager/PPpackage/metamanager/resolve.py similarity index 100% rename from metamanager/PPpackage/metamanager/resolve.py rename to src/metamanager/PPpackage/metamanager/resolve.py diff --git a/metamanager/PPpackage/metamanager/schemes/__init__.py b/src/metamanager/PPpackage/metamanager/schemes/__init__.py similarity index 100% rename from metamanager/PPpackage/metamanager/schemes/__init__.py rename to src/metamanager/PPpackage/metamanager/schemes/__init__.py diff --git a/metamanager/PPpackage/metamanager/schemes/node.py b/src/metamanager/PPpackage/metamanager/schemes/node.py similarity index 100% rename from metamanager/PPpackage/metamanager/schemes/node.py rename to src/metamanager/PPpackage/metamanager/schemes/node.py diff --git a/metamanager/PPpackage/metamanager/translate_options.py b/src/metamanager/PPpackage/metamanager/translate_options.py similarity index 100% rename from metamanager/PPpackage/metamanager/translate_options.py rename to src/metamanager/PPpackage/metamanager/translate_options.py diff --git a/metamanager/PPpackage/metamanager/translators.py b/src/metamanager/PPpackage/metamanager/translators.py similarity index 100% rename from metamanager/PPpackage/metamanager/translators.py rename to src/metamanager/PPpackage/metamanager/translators.py diff --git a/metamanager/PPpackage/metamanager/utils.py b/src/metamanager/PPpackage/metamanager/utils.py similarity index 100% rename from metamanager/PPpackage/metamanager/utils.py rename to src/metamanager/PPpackage/metamanager/utils.py diff --git a/metamanager/setup.py b/src/metamanager/setup.py similarity index 100% rename from metamanager/setup.py rename to src/metamanager/setup.py diff --git a/repository-driver/AUR/PPpackage/repository_driver/AUR/__init__.py b/src/repository-driver/AUR/PPpackage/repository_driver/AUR/__init__.py similarity index 100% rename from repository-driver/AUR/PPpackage/repository_driver/AUR/__init__.py rename to src/repository-driver/AUR/PPpackage/repository_driver/AUR/__init__.py diff --git a/repository-driver/AUR/PPpackage/repository_driver/AUR/compute_product_info.py b/src/repository-driver/AUR/PPpackage/repository_driver/AUR/compute_product_info.py similarity index 100% rename from repository-driver/AUR/PPpackage/repository_driver/AUR/compute_product_info.py rename to src/repository-driver/AUR/PPpackage/repository_driver/AUR/compute_product_info.py diff --git a/repository-driver/AUR/PPpackage/repository_driver/AUR/epoch.py b/src/repository-driver/AUR/PPpackage/repository_driver/AUR/epoch.py similarity index 100% rename from repository-driver/AUR/PPpackage/repository_driver/AUR/epoch.py rename to src/repository-driver/AUR/PPpackage/repository_driver/AUR/epoch.py diff --git a/repository-driver/AUR/PPpackage/repository_driver/AUR/fetch_translator_data.py b/src/repository-driver/AUR/PPpackage/repository_driver/AUR/fetch_translator_data.py similarity index 100% rename from repository-driver/AUR/PPpackage/repository_driver/AUR/fetch_translator_data.py rename to src/repository-driver/AUR/PPpackage/repository_driver/AUR/fetch_translator_data.py diff --git a/repository-driver/AUR/PPpackage/repository_driver/AUR/get_build_context.py b/src/repository-driver/AUR/PPpackage/repository_driver/AUR/get_build_context.py similarity index 100% rename from repository-driver/AUR/PPpackage/repository_driver/AUR/get_build_context.py rename to src/repository-driver/AUR/PPpackage/repository_driver/AUR/get_build_context.py diff --git a/repository-driver/AUR/PPpackage/repository_driver/AUR/get_epoch.py b/src/repository-driver/AUR/PPpackage/repository_driver/AUR/get_epoch.py similarity index 100% rename from repository-driver/AUR/PPpackage/repository_driver/AUR/get_epoch.py rename to src/repository-driver/AUR/PPpackage/repository_driver/AUR/get_epoch.py diff --git a/repository-driver/AUR/PPpackage/repository_driver/AUR/get_formula.py b/src/repository-driver/AUR/PPpackage/repository_driver/AUR/get_formula.py similarity index 100% rename from repository-driver/AUR/PPpackage/repository_driver/AUR/get_formula.py rename to src/repository-driver/AUR/PPpackage/repository_driver/AUR/get_formula.py diff --git a/repository-driver/AUR/PPpackage/repository_driver/AUR/get_package_detail.py b/src/repository-driver/AUR/PPpackage/repository_driver/AUR/get_package_detail.py similarity index 100% rename from repository-driver/AUR/PPpackage/repository_driver/AUR/get_package_detail.py rename to src/repository-driver/AUR/PPpackage/repository_driver/AUR/get_package_detail.py diff --git a/repository-driver/AUR/PPpackage/repository_driver/AUR/interface.py b/src/repository-driver/AUR/PPpackage/repository_driver/AUR/interface.py similarity index 100% rename from repository-driver/AUR/PPpackage/repository_driver/AUR/interface.py rename to src/repository-driver/AUR/PPpackage/repository_driver/AUR/interface.py diff --git a/repository-driver/AUR/PPpackage/repository_driver/AUR/lifespan.py b/src/repository-driver/AUR/PPpackage/repository_driver/AUR/lifespan.py similarity index 100% rename from repository-driver/AUR/PPpackage/repository_driver/AUR/lifespan.py rename to src/repository-driver/AUR/PPpackage/repository_driver/AUR/lifespan.py diff --git a/repository-driver/AUR/PPpackage/repository_driver/AUR/schemes.py b/src/repository-driver/AUR/PPpackage/repository_driver/AUR/schemes.py similarity index 100% rename from repository-driver/AUR/PPpackage/repository_driver/AUR/schemes.py rename to src/repository-driver/AUR/PPpackage/repository_driver/AUR/schemes.py diff --git a/repository-driver/AUR/PPpackage/repository_driver/AUR/state.py b/src/repository-driver/AUR/PPpackage/repository_driver/AUR/state.py similarity index 100% rename from repository-driver/AUR/PPpackage/repository_driver/AUR/state.py rename to src/repository-driver/AUR/PPpackage/repository_driver/AUR/state.py diff --git a/repository-driver/AUR/PPpackage/repository_driver/AUR/translate_options.py b/src/repository-driver/AUR/PPpackage/repository_driver/AUR/translate_options.py similarity index 100% rename from repository-driver/AUR/PPpackage/repository_driver/AUR/translate_options.py rename to src/repository-driver/AUR/PPpackage/repository_driver/AUR/translate_options.py diff --git a/repository-driver/AUR/PPpackage/repository_driver/AUR/update.py b/src/repository-driver/AUR/PPpackage/repository_driver/AUR/update.py similarity index 100% rename from repository-driver/AUR/PPpackage/repository_driver/AUR/update.py rename to src/repository-driver/AUR/PPpackage/repository_driver/AUR/update.py diff --git a/repository-driver/AUR/PPpackage/repository_driver/AUR/utils.py b/src/repository-driver/AUR/PPpackage/repository_driver/AUR/utils.py similarity index 100% rename from repository-driver/AUR/PPpackage/repository_driver/AUR/utils.py rename to src/repository-driver/AUR/PPpackage/repository_driver/AUR/utils.py diff --git a/repository-driver/AUR/setup.py b/src/repository-driver/AUR/setup.py similarity index 100% rename from repository-driver/AUR/setup.py rename to src/repository-driver/AUR/setup.py diff --git a/repository-driver/conan/PPpackage/repository_driver/conan/__init__.py b/src/repository-driver/conan/PPpackage/repository_driver/conan/__init__.py similarity index 100% rename from repository-driver/conan/PPpackage/repository_driver/conan/__init__.py rename to src/repository-driver/conan/PPpackage/repository_driver/conan/__init__.py diff --git a/repository-driver/conan/PPpackage/repository_driver/conan/compute_product_info.py b/src/repository-driver/conan/PPpackage/repository_driver/conan/compute_product_info.py similarity index 100% rename from repository-driver/conan/PPpackage/repository_driver/conan/compute_product_info.py rename to src/repository-driver/conan/PPpackage/repository_driver/conan/compute_product_info.py diff --git a/repository-driver/conan/PPpackage/repository_driver/conan/epoch.py b/src/repository-driver/conan/PPpackage/repository_driver/conan/epoch.py similarity index 100% rename from repository-driver/conan/PPpackage/repository_driver/conan/epoch.py rename to src/repository-driver/conan/PPpackage/repository_driver/conan/epoch.py diff --git a/repository-driver/conan/PPpackage/repository_driver/conan/fetch_translator_data.py b/src/repository-driver/conan/PPpackage/repository_driver/conan/fetch_translator_data.py similarity index 100% rename from repository-driver/conan/PPpackage/repository_driver/conan/fetch_translator_data.py rename to src/repository-driver/conan/PPpackage/repository_driver/conan/fetch_translator_data.py diff --git a/repository-driver/conan/PPpackage/repository_driver/conan/get_build_context.py b/src/repository-driver/conan/PPpackage/repository_driver/conan/get_build_context.py similarity index 100% rename from repository-driver/conan/PPpackage/repository_driver/conan/get_build_context.py rename to src/repository-driver/conan/PPpackage/repository_driver/conan/get_build_context.py diff --git a/repository-driver/conan/PPpackage/repository_driver/conan/get_epoch.py b/src/repository-driver/conan/PPpackage/repository_driver/conan/get_epoch.py similarity index 100% rename from repository-driver/conan/PPpackage/repository_driver/conan/get_epoch.py rename to src/repository-driver/conan/PPpackage/repository_driver/conan/get_epoch.py diff --git a/repository-driver/conan/PPpackage/repository_driver/conan/get_formula.py b/src/repository-driver/conan/PPpackage/repository_driver/conan/get_formula.py similarity index 100% rename from repository-driver/conan/PPpackage/repository_driver/conan/get_formula.py rename to src/repository-driver/conan/PPpackage/repository_driver/conan/get_formula.py diff --git a/repository-driver/conan/PPpackage/repository_driver/conan/get_package_detail.py b/src/repository-driver/conan/PPpackage/repository_driver/conan/get_package_detail.py similarity index 100% rename from repository-driver/conan/PPpackage/repository_driver/conan/get_package_detail.py rename to src/repository-driver/conan/PPpackage/repository_driver/conan/get_package_detail.py diff --git a/repository-driver/conan/PPpackage/repository_driver/conan/interface.py b/src/repository-driver/conan/PPpackage/repository_driver/conan/interface.py similarity index 100% rename from repository-driver/conan/PPpackage/repository_driver/conan/interface.py rename to src/repository-driver/conan/PPpackage/repository_driver/conan/interface.py diff --git a/repository-driver/conan/PPpackage/repository_driver/conan/lifespan.py b/src/repository-driver/conan/PPpackage/repository_driver/conan/lifespan.py similarity index 100% rename from repository-driver/conan/PPpackage/repository_driver/conan/lifespan.py rename to src/repository-driver/conan/PPpackage/repository_driver/conan/lifespan.py diff --git a/repository-driver/conan/PPpackage/repository_driver/conan/schemes.py b/src/repository-driver/conan/PPpackage/repository_driver/conan/schemes.py similarity index 100% rename from repository-driver/conan/PPpackage/repository_driver/conan/schemes.py rename to src/repository-driver/conan/PPpackage/repository_driver/conan/schemes.py diff --git a/repository-driver/conan/PPpackage/repository_driver/conan/state.py b/src/repository-driver/conan/PPpackage/repository_driver/conan/state.py similarity index 100% rename from repository-driver/conan/PPpackage/repository_driver/conan/state.py rename to src/repository-driver/conan/PPpackage/repository_driver/conan/state.py diff --git a/repository-driver/conan/PPpackage/repository_driver/conan/translate_options.py b/src/repository-driver/conan/PPpackage/repository_driver/conan/translate_options.py similarity index 100% rename from repository-driver/conan/PPpackage/repository_driver/conan/translate_options.py rename to src/repository-driver/conan/PPpackage/repository_driver/conan/translate_options.py diff --git a/repository-driver/conan/PPpackage/repository_driver/conan/update.py b/src/repository-driver/conan/PPpackage/repository_driver/conan/update.py similarity index 100% rename from repository-driver/conan/PPpackage/repository_driver/conan/update.py rename to src/repository-driver/conan/PPpackage/repository_driver/conan/update.py diff --git a/repository-driver/conan/PPpackage/repository_driver/conan/utils.py b/src/repository-driver/conan/PPpackage/repository_driver/conan/utils.py similarity index 100% rename from repository-driver/conan/PPpackage/repository_driver/conan/utils.py rename to src/repository-driver/conan/PPpackage/repository_driver/conan/utils.py diff --git a/repository-driver/conan/setup.py b/src/repository-driver/conan/setup.py similarity index 100% rename from repository-driver/conan/setup.py rename to src/repository-driver/conan/setup.py diff --git a/repository-driver/interface/PPpackage/repository_driver/interface/__init__.py b/src/repository-driver/interface/PPpackage/repository_driver/interface/__init__.py similarity index 100% rename from repository-driver/interface/PPpackage/repository_driver/interface/__init__.py rename to src/repository-driver/interface/PPpackage/repository_driver/interface/__init__.py diff --git a/repository-driver/interface/PPpackage/repository_driver/interface/exceptions.py b/src/repository-driver/interface/PPpackage/repository_driver/interface/exceptions.py similarity index 100% rename from repository-driver/interface/PPpackage/repository_driver/interface/exceptions.py rename to src/repository-driver/interface/PPpackage/repository_driver/interface/exceptions.py diff --git a/repository-driver/interface/PPpackage/repository_driver/interface/interface.py b/src/repository-driver/interface/PPpackage/repository_driver/interface/interface.py similarity index 100% rename from repository-driver/interface/PPpackage/repository_driver/interface/interface.py rename to src/repository-driver/interface/PPpackage/repository_driver/interface/interface.py diff --git a/repository-driver/interface/PPpackage/repository_driver/interface/schemes.py b/src/repository-driver/interface/PPpackage/repository_driver/interface/schemes.py similarity index 100% rename from repository-driver/interface/PPpackage/repository_driver/interface/schemes.py rename to src/repository-driver/interface/PPpackage/repository_driver/interface/schemes.py diff --git a/repository-driver/interface/PPpackage/repository_driver/interface/utils.py b/src/repository-driver/interface/PPpackage/repository_driver/interface/utils.py similarity index 100% rename from repository-driver/interface/PPpackage/repository_driver/interface/utils.py rename to src/repository-driver/interface/PPpackage/repository_driver/interface/utils.py diff --git a/repository-driver/interface/setup.py b/src/repository-driver/interface/setup.py similarity index 100% rename from repository-driver/interface/setup.py rename to src/repository-driver/interface/setup.py diff --git a/repository-driver/pacman/PPpackage/repository_driver/pacman/__init__.py b/src/repository-driver/pacman/PPpackage/repository_driver/pacman/__init__.py similarity index 100% rename from repository-driver/pacman/PPpackage/repository_driver/pacman/__init__.py rename to src/repository-driver/pacman/PPpackage/repository_driver/pacman/__init__.py diff --git a/repository-driver/pacman/PPpackage/repository_driver/pacman/compute_product_info.py b/src/repository-driver/pacman/PPpackage/repository_driver/pacman/compute_product_info.py similarity index 100% rename from repository-driver/pacman/PPpackage/repository_driver/pacman/compute_product_info.py rename to src/repository-driver/pacman/PPpackage/repository_driver/pacman/compute_product_info.py diff --git a/repository-driver/pacman/PPpackage/repository_driver/pacman/epoch.py b/src/repository-driver/pacman/PPpackage/repository_driver/pacman/epoch.py similarity index 100% rename from repository-driver/pacman/PPpackage/repository_driver/pacman/epoch.py rename to src/repository-driver/pacman/PPpackage/repository_driver/pacman/epoch.py diff --git a/repository-driver/pacman/PPpackage/repository_driver/pacman/fetch_translator_data.py b/src/repository-driver/pacman/PPpackage/repository_driver/pacman/fetch_translator_data.py similarity index 100% rename from repository-driver/pacman/PPpackage/repository_driver/pacman/fetch_translator_data.py rename to src/repository-driver/pacman/PPpackage/repository_driver/pacman/fetch_translator_data.py diff --git a/repository-driver/pacman/PPpackage/repository_driver/pacman/get_build_context.py b/src/repository-driver/pacman/PPpackage/repository_driver/pacman/get_build_context.py similarity index 100% rename from repository-driver/pacman/PPpackage/repository_driver/pacman/get_build_context.py rename to src/repository-driver/pacman/PPpackage/repository_driver/pacman/get_build_context.py diff --git a/repository-driver/pacman/PPpackage/repository_driver/pacman/get_epoch.py b/src/repository-driver/pacman/PPpackage/repository_driver/pacman/get_epoch.py similarity index 100% rename from repository-driver/pacman/PPpackage/repository_driver/pacman/get_epoch.py rename to src/repository-driver/pacman/PPpackage/repository_driver/pacman/get_epoch.py diff --git a/repository-driver/pacman/PPpackage/repository_driver/pacman/get_formula.py b/src/repository-driver/pacman/PPpackage/repository_driver/pacman/get_formula.py similarity index 100% rename from repository-driver/pacman/PPpackage/repository_driver/pacman/get_formula.py rename to src/repository-driver/pacman/PPpackage/repository_driver/pacman/get_formula.py diff --git a/repository-driver/pacman/PPpackage/repository_driver/pacman/get_package_detail.py b/src/repository-driver/pacman/PPpackage/repository_driver/pacman/get_package_detail.py similarity index 100% rename from repository-driver/pacman/PPpackage/repository_driver/pacman/get_package_detail.py rename to src/repository-driver/pacman/PPpackage/repository_driver/pacman/get_package_detail.py diff --git a/repository-driver/pacman/PPpackage/repository_driver/pacman/interface.py b/src/repository-driver/pacman/PPpackage/repository_driver/pacman/interface.py similarity index 100% rename from repository-driver/pacman/PPpackage/repository_driver/pacman/interface.py rename to src/repository-driver/pacman/PPpackage/repository_driver/pacman/interface.py diff --git a/repository-driver/pacman/PPpackage/repository_driver/pacman/lifespan.py b/src/repository-driver/pacman/PPpackage/repository_driver/pacman/lifespan.py similarity index 100% rename from repository-driver/pacman/PPpackage/repository_driver/pacman/lifespan.py rename to src/repository-driver/pacman/PPpackage/repository_driver/pacman/lifespan.py diff --git a/repository-driver/pacman/PPpackage/repository_driver/pacman/schemes.py b/src/repository-driver/pacman/PPpackage/repository_driver/pacman/schemes.py similarity index 100% rename from repository-driver/pacman/PPpackage/repository_driver/pacman/schemes.py rename to src/repository-driver/pacman/PPpackage/repository_driver/pacman/schemes.py diff --git a/repository-driver/pacman/PPpackage/repository_driver/pacman/state.py b/src/repository-driver/pacman/PPpackage/repository_driver/pacman/state.py similarity index 100% rename from repository-driver/pacman/PPpackage/repository_driver/pacman/state.py rename to src/repository-driver/pacman/PPpackage/repository_driver/pacman/state.py diff --git a/repository-driver/pacman/PPpackage/repository_driver/pacman/translate_options.py b/src/repository-driver/pacman/PPpackage/repository_driver/pacman/translate_options.py similarity index 100% rename from repository-driver/pacman/PPpackage/repository_driver/pacman/translate_options.py rename to src/repository-driver/pacman/PPpackage/repository_driver/pacman/translate_options.py diff --git a/repository-driver/pacman/PPpackage/repository_driver/pacman/update.py b/src/repository-driver/pacman/PPpackage/repository_driver/pacman/update.py similarity index 100% rename from repository-driver/pacman/PPpackage/repository_driver/pacman/update.py rename to src/repository-driver/pacman/PPpackage/repository_driver/pacman/update.py diff --git a/repository-driver/pacman/PPpackage/repository_driver/pacman/utils.py b/src/repository-driver/pacman/PPpackage/repository_driver/pacman/utils.py similarity index 100% rename from repository-driver/pacman/PPpackage/repository_driver/pacman/utils.py rename to src/repository-driver/pacman/PPpackage/repository_driver/pacman/utils.py diff --git a/repository-driver/pacman/setup.py b/src/repository-driver/pacman/setup.py similarity index 100% rename from repository-driver/pacman/setup.py rename to src/repository-driver/pacman/setup.py diff --git a/repository-driver/update/PPpackage/repository_driver/update/__main__.py b/src/repository-driver/update/PPpackage/repository_driver/update/__main__.py similarity index 100% rename from repository-driver/update/PPpackage/repository_driver/update/__main__.py rename to src/repository-driver/update/PPpackage/repository_driver/update/__main__.py diff --git a/repository-driver/update/setup.py b/src/repository-driver/update/setup.py similarity index 100% rename from repository-driver/update/setup.py rename to src/repository-driver/update/setup.py diff --git a/solver/Solver.java b/src/solver/Solver.java similarity index 100% rename from solver/Solver.java rename to src/solver/Solver.java diff --git a/translator/conan/PPpackage/translator/conan/__init__.py b/src/translator/conan/PPpackage/translator/conan/__init__.py similarity index 100% rename from translator/conan/PPpackage/translator/conan/__init__.py rename to src/translator/conan/PPpackage/translator/conan/__init__.py diff --git a/translator/conan/PPpackage/translator/conan/get_assumptions.py b/src/translator/conan/PPpackage/translator/conan/get_assumptions.py similarity index 100% rename from translator/conan/PPpackage/translator/conan/get_assumptions.py rename to src/translator/conan/PPpackage/translator/conan/get_assumptions.py diff --git a/translator/conan/PPpackage/translator/conan/interface.py b/src/translator/conan/PPpackage/translator/conan/interface.py similarity index 100% rename from translator/conan/PPpackage/translator/conan/interface.py rename to src/translator/conan/PPpackage/translator/conan/interface.py diff --git a/translator/conan/PPpackage/translator/conan/schemes.py b/src/translator/conan/PPpackage/translator/conan/schemes.py similarity index 100% rename from translator/conan/PPpackage/translator/conan/schemes.py rename to src/translator/conan/PPpackage/translator/conan/schemes.py diff --git a/translator/conan/PPpackage/translator/conan/translate_requirement.py b/src/translator/conan/PPpackage/translator/conan/translate_requirement.py similarity index 100% rename from translator/conan/PPpackage/translator/conan/translate_requirement.py rename to src/translator/conan/PPpackage/translator/conan/translate_requirement.py diff --git a/translator/conan/setup.py b/src/translator/conan/setup.py similarity index 100% rename from translator/conan/setup.py rename to src/translator/conan/setup.py diff --git a/translator/interface/PPpackage/translator/interface/__init__.py b/src/translator/interface/PPpackage/translator/interface/__init__.py similarity index 100% rename from translator/interface/PPpackage/translator/interface/__init__.py rename to src/translator/interface/PPpackage/translator/interface/__init__.py diff --git a/translator/interface/PPpackage/translator/interface/interface.py b/src/translator/interface/PPpackage/translator/interface/interface.py similarity index 100% rename from translator/interface/PPpackage/translator/interface/interface.py rename to src/translator/interface/PPpackage/translator/interface/interface.py diff --git a/translator/interface/PPpackage/translator/interface/schemes.py b/src/translator/interface/PPpackage/translator/interface/schemes.py similarity index 100% rename from translator/interface/PPpackage/translator/interface/schemes.py rename to src/translator/interface/PPpackage/translator/interface/schemes.py diff --git a/translator/interface/setup.py b/src/translator/interface/setup.py similarity index 100% rename from translator/interface/setup.py rename to src/translator/interface/setup.py diff --git a/translator/pacman/PPpackage/translator/pacman/__init__.py b/src/translator/pacman/PPpackage/translator/pacman/__init__.py similarity index 100% rename from translator/pacman/PPpackage/translator/pacman/__init__.py rename to src/translator/pacman/PPpackage/translator/pacman/__init__.py diff --git a/translator/pacman/PPpackage/translator/pacman/get_assumptions.py b/src/translator/pacman/PPpackage/translator/pacman/get_assumptions.py similarity index 100% rename from translator/pacman/PPpackage/translator/pacman/get_assumptions.py rename to src/translator/pacman/PPpackage/translator/pacman/get_assumptions.py diff --git a/translator/pacman/PPpackage/translator/pacman/interface.py b/src/translator/pacman/PPpackage/translator/pacman/interface.py similarity index 100% rename from translator/pacman/PPpackage/translator/pacman/interface.py rename to src/translator/pacman/PPpackage/translator/pacman/interface.py diff --git a/translator/pacman/PPpackage/translator/pacman/schemes.py b/src/translator/pacman/PPpackage/translator/pacman/schemes.py similarity index 100% rename from translator/pacman/PPpackage/translator/pacman/schemes.py rename to src/translator/pacman/PPpackage/translator/pacman/schemes.py diff --git a/translator/pacman/PPpackage/translator/pacman/translate_requirement.py b/src/translator/pacman/PPpackage/translator/pacman/translate_requirement.py similarity index 100% rename from translator/pacman/PPpackage/translator/pacman/translate_requirement.py rename to src/translator/pacman/PPpackage/translator/pacman/translate_requirement.py diff --git a/translator/pacman/PPpackage/translator/pacman/utils.py b/src/translator/pacman/PPpackage/translator/pacman/utils.py similarity index 100% rename from translator/pacman/PPpackage/translator/pacman/utils.py rename to src/translator/pacman/PPpackage/translator/pacman/utils.py diff --git a/translator/pacman/setup.py b/src/translator/pacman/setup.py similarity index 100% rename from translator/pacman/setup.py rename to src/translator/pacman/setup.py diff --git a/utils/async/PPpackage/utils/async_/__init__.py b/src/utils/async/PPpackage/utils/async_/__init__.py similarity index 100% rename from utils/async/PPpackage/utils/async_/__init__.py rename to src/utils/async/PPpackage/utils/async_/__init__.py diff --git a/utils/async/setup.py b/src/utils/async/setup.py similarity index 100% rename from utils/async/setup.py rename to src/utils/async/setup.py diff --git a/utils/cli/PPpackage/utils/cli/__init__.py b/src/utils/cli/PPpackage/utils/cli/__init__.py similarity index 100% rename from utils/cli/PPpackage/utils/cli/__init__.py rename to src/utils/cli/PPpackage/utils/cli/__init__.py diff --git a/utils/cli/setup.py b/src/utils/cli/setup.py similarity index 100% rename from utils/cli/setup.py rename to src/utils/cli/setup.py diff --git a/utils/container/PPpackage/utils/container/__init__.py b/src/utils/container/PPpackage/utils/container/__init__.py similarity index 100% rename from utils/container/PPpackage/utils/container/__init__.py rename to src/utils/container/PPpackage/utils/container/__init__.py diff --git a/utils/container/PPpackage/utils/container/schemes.py b/src/utils/container/PPpackage/utils/container/schemes.py similarity index 100% rename from utils/container/PPpackage/utils/container/schemes.py rename to src/utils/container/PPpackage/utils/container/schemes.py diff --git a/utils/container/setup.py b/src/utils/container/setup.py similarity index 100% rename from utils/container/setup.py rename to src/utils/container/setup.py diff --git a/utils/file/PPpackage/utils/file/__init__.py b/src/utils/file/PPpackage/utils/file/__init__.py similarity index 100% rename from utils/file/PPpackage/utils/file/__init__.py rename to src/utils/file/PPpackage/utils/file/__init__.py diff --git a/utils/file/setup.py b/src/utils/file/setup.py similarity index 100% rename from utils/file/setup.py rename to src/utils/file/setup.py diff --git a/utils/json/PPpackage/utils/json/__init__.py b/src/utils/json/PPpackage/utils/json/__init__.py similarity index 100% rename from utils/json/PPpackage/utils/json/__init__.py rename to src/utils/json/PPpackage/utils/json/__init__.py diff --git a/utils/json/PPpackage/utils/json/dump.py b/src/utils/json/PPpackage/utils/json/dump.py similarity index 100% rename from utils/json/PPpackage/utils/json/dump.py rename to src/utils/json/PPpackage/utils/json/dump.py diff --git a/utils/json/PPpackage/utils/json/utils.py b/src/utils/json/PPpackage/utils/json/utils.py similarity index 100% rename from utils/json/PPpackage/utils/json/utils.py rename to src/utils/json/PPpackage/utils/json/utils.py diff --git a/utils/json/PPpackage/utils/json/validate.py b/src/utils/json/PPpackage/utils/json/validate.py similarity index 100% rename from utils/json/PPpackage/utils/json/validate.py rename to src/utils/json/PPpackage/utils/json/validate.py diff --git a/utils/json/PPpackage/utils/json/validator.py b/src/utils/json/PPpackage/utils/json/validator.py similarity index 100% rename from utils/json/PPpackage/utils/json/validator.py rename to src/utils/json/PPpackage/utils/json/validator.py diff --git a/utils/json/setup.py b/src/utils/json/setup.py similarity index 100% rename from utils/json/setup.py rename to src/utils/json/setup.py diff --git a/utils/lock/PPpackage/utils/lock/__init__.py b/src/utils/lock/PPpackage/utils/lock/__init__.py similarity index 100% rename from utils/lock/PPpackage/utils/lock/__init__.py rename to src/utils/lock/PPpackage/utils/lock/__init__.py diff --git a/utils/lock/PPpackage/utils/lock/by_key.py b/src/utils/lock/PPpackage/utils/lock/by_key.py similarity index 100% rename from utils/lock/PPpackage/utils/lock/by_key.py rename to src/utils/lock/PPpackage/utils/lock/by_key.py diff --git a/utils/lock/PPpackage/utils/lock/rw.py b/src/utils/lock/PPpackage/utils/lock/rw.py similarity index 100% rename from utils/lock/PPpackage/utils/lock/rw.py rename to src/utils/lock/PPpackage/utils/lock/rw.py diff --git a/utils/lock/setup.py b/src/utils/lock/setup.py similarity index 100% rename from utils/lock/setup.py rename to src/utils/lock/setup.py diff --git a/utils/python/PPpackage/utils/python/__init__.py b/src/utils/python/PPpackage/utils/python/__init__.py similarity index 100% rename from utils/python/PPpackage/utils/python/__init__.py rename to src/utils/python/PPpackage/utils/python/__init__.py diff --git a/utils/python/setup.py b/src/utils/python/setup.py similarity index 100% rename from utils/python/setup.py rename to src/utils/python/setup.py diff --git a/utils/serialization/PPpackage/utils/serialization/__init__.py b/src/utils/serialization/PPpackage/utils/serialization/__init__.py similarity index 100% rename from utils/serialization/PPpackage/utils/serialization/__init__.py rename to src/utils/serialization/PPpackage/utils/serialization/__init__.py diff --git a/utils/serialization/PPpackage/utils/serialization/asyncio.py b/src/utils/serialization/PPpackage/utils/serialization/asyncio.py similarity index 100% rename from utils/serialization/PPpackage/utils/serialization/asyncio.py rename to src/utils/serialization/PPpackage/utils/serialization/asyncio.py diff --git a/utils/serialization/PPpackage/utils/serialization/chunk_reader.py b/src/utils/serialization/PPpackage/utils/serialization/chunk_reader.py similarity index 100% rename from utils/serialization/PPpackage/utils/serialization/chunk_reader.py rename to src/utils/serialization/PPpackage/utils/serialization/chunk_reader.py diff --git a/utils/serialization/PPpackage/utils/serialization/reader.py b/src/utils/serialization/PPpackage/utils/serialization/reader.py similarity index 100% rename from utils/serialization/PPpackage/utils/serialization/reader.py rename to src/utils/serialization/PPpackage/utils/serialization/reader.py diff --git a/utils/serialization/PPpackage/utils/serialization/utils.py b/src/utils/serialization/PPpackage/utils/serialization/utils.py similarity index 100% rename from utils/serialization/PPpackage/utils/serialization/utils.py rename to src/utils/serialization/PPpackage/utils/serialization/utils.py diff --git a/utils/serialization/PPpackage/utils/serialization/writer.py b/src/utils/serialization/PPpackage/utils/serialization/writer.py similarity index 100% rename from utils/serialization/PPpackage/utils/serialization/writer.py rename to src/utils/serialization/PPpackage/utils/serialization/writer.py diff --git a/utils/serialization/setup.py b/src/utils/serialization/setup.py similarity index 100% rename from utils/serialization/setup.py rename to src/utils/serialization/setup.py