diff --git a/Dockerfile b/Dockerfile
index a9b4d7a..5db284a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,16 +15,15 @@ RUN pip install --upgrade pip && \
 
 
 # install docker for WACZ
-RUN curl -fsSL https://get.docker.com | sh
+# TODO: currently disabled see https://github.com/bellingcat/auto-archiver/issues/66
+# RUN curl -fsSL https://get.docker.com | sh
 
 # RUN git clone https://github.com/bellingcat/auto-archiver
 # TODO: avoid copying unnecessary files, including .git
-# COPY ./src/ .
 COPY Pipfile Pipfile.lock ./
 RUN pipenv install --python=3.10 --system --deploy
-# TODO: to avoid copying pipfile lock it should be on the .dockerignore
 ENV IS_DOCKER=1
-COPY . . 
+COPY ./src/ . 
 
 # CMD ["pipenv", "run", "python", "auto_archive.py"]
 ENTRYPOINT ["python", "auto_archive.py"]
diff --git a/src/__init__.py b/src/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/archivers/__init__.py b/src/archivers/__init__.py
similarity index 100%
rename from archivers/__init__.py
rename to src/archivers/__init__.py
diff --git a/archivers/base_archiver.py b/src/archivers/base_archiver.py
similarity index 100%
rename from archivers/base_archiver.py
rename to src/archivers/base_archiver.py
diff --git a/archivers/instagram_archiver.py b/src/archivers/instagram_archiver.py
similarity index 100%
rename from archivers/instagram_archiver.py
rename to src/archivers/instagram_archiver.py
diff --git a/archivers/telegram_archiver.py b/src/archivers/telegram_archiver.py
similarity index 100%
rename from archivers/telegram_archiver.py
rename to src/archivers/telegram_archiver.py
diff --git a/archivers/telethon_archiver.py b/src/archivers/telethon_archiver.py
similarity index 100%
rename from archivers/telethon_archiver.py
rename to src/archivers/telethon_archiver.py
diff --git a/archivers/tiktok_archiver.py b/src/archivers/tiktok_archiver.py
similarity index 100%
rename from archivers/tiktok_archiver.py
rename to src/archivers/tiktok_archiver.py
diff --git a/archivers/twitter_api_archiver.py b/src/archivers/twitter_api_archiver.py
similarity index 100%
rename from archivers/twitter_api_archiver.py
rename to src/archivers/twitter_api_archiver.py
diff --git a/archivers/twitter_archiver.py b/src/archivers/twitter_archiver.py
similarity index 100%
rename from archivers/twitter_archiver.py
rename to src/archivers/twitter_archiver.py
diff --git a/archivers/vk_archiver.py b/src/archivers/vk_archiver.py
similarity index 100%
rename from archivers/vk_archiver.py
rename to src/archivers/vk_archiver.py
diff --git a/archivers/wayback_archiver.py b/src/archivers/wayback_archiver.py
similarity index 100%
rename from archivers/wayback_archiver.py
rename to src/archivers/wayback_archiver.py
diff --git a/archivers/youtubedl_archiver.py b/src/archivers/youtubedl_archiver.py
similarity index 100%
rename from archivers/youtubedl_archiver.py
rename to src/archivers/youtubedl_archiver.py
diff --git a/auto_archive.py b/src/auto_archive.py
similarity index 100%
rename from auto_archive.py
rename to src/auto_archive.py
diff --git a/auto_auto_archive.py b/src/auto_auto_archive.py
similarity index 100%
rename from auto_auto_archive.py
rename to src/auto_auto_archive.py
diff --git a/src/cli.py b/src/cli.py
new file mode 100644
index 0000000..e69de29
diff --git a/configs/__init__.py b/src/configs/__init__.py
similarity index 100%
rename from configs/__init__.py
rename to src/configs/__init__.py
diff --git a/configs/browsertrix_config.py b/src/configs/browsertrix_config.py
similarity index 100%
rename from configs/browsertrix_config.py
rename to src/configs/browsertrix_config.py
diff --git a/configs/config.py b/src/configs/config.py
similarity index 100%
rename from configs/config.py
rename to src/configs/config.py
diff --git a/configs/instagram_config.py b/src/configs/instagram_config.py
similarity index 100%
rename from configs/instagram_config.py
rename to src/configs/instagram_config.py
diff --git a/configs/selenium_config.py b/src/configs/selenium_config.py
similarity index 100%
rename from configs/selenium_config.py
rename to src/configs/selenium_config.py
diff --git a/configs/telethon_config.py b/src/configs/telethon_config.py
similarity index 100%
rename from configs/telethon_config.py
rename to src/configs/telethon_config.py
diff --git a/configs/twitter_api_config.py b/src/configs/twitter_api_config.py
similarity index 100%
rename from configs/twitter_api_config.py
rename to src/configs/twitter_api_config.py
diff --git a/configs/vk_config.py b/src/configs/vk_config.py
similarity index 100%
rename from configs/vk_config.py
rename to src/configs/vk_config.py
diff --git a/configs/wayback_config.py b/src/configs/wayback_config.py
similarity index 100%
rename from configs/wayback_config.py
rename to src/configs/wayback_config.py
diff --git a/storages/__init__.py b/src/storages/__init__.py
similarity index 100%
rename from storages/__init__.py
rename to src/storages/__init__.py
diff --git a/storages/base_storage.py b/src/storages/base_storage.py
similarity index 100%
rename from storages/base_storage.py
rename to src/storages/base_storage.py
diff --git a/storages/gd_storage.py b/src/storages/gd_storage.py
similarity index 100%
rename from storages/gd_storage.py
rename to src/storages/gd_storage.py
diff --git a/storages/local_storage.py b/src/storages/local_storage.py
similarity index 100%
rename from storages/local_storage.py
rename to src/storages/local_storage.py
diff --git a/storages/s3_storage.py b/src/storages/s3_storage.py
similarity index 100%
rename from storages/s3_storage.py
rename to src/storages/s3_storage.py
diff --git a/utils/__init__.py b/src/utils/__init__.py
similarity index 100%
rename from utils/__init__.py
rename to src/utils/__init__.py
diff --git a/utils/gworksheet.py b/src/utils/gworksheet.py
similarity index 100%
rename from utils/gworksheet.py
rename to src/utils/gworksheet.py
diff --git a/utils/misc.py b/src/utils/misc.py
similarity index 100%
rename from utils/misc.py
rename to src/utils/misc.py