diff --git a/.gitignore b/.gitignore
index 7a7057688..999e24dfc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,9 +5,9 @@ wiki
 .ropeproject/
 .sass-cache/
 docs/_build
-cli/popper.egg-info/
-cli/build
-cli/dist
+src/popper.egg-info/
+src/build
+src/dist
 .idea/
 .cache
 popper_logs
@@ -16,4 +16,4 @@ popper_status
 popper_logs
 popper_status
 .pipeline_cache.yml
-cli/popper/_version.py
+src/popper/_version.py
diff --git a/.travis.yml b/.travis.yml
index 25cecd816..b719bf17f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ env:
 - ENGINE=singularity
 services: docker
 before_install:
-- src/extras/install_singularity.sh
+- src/scripts/install_singularity.sh
 - pip install coverage
 install:
 - pip install src/[dev]
diff --git a/src/extras/bash-completion.sh b/src/scripts/bash-completion.sh
similarity index 100%
rename from src/extras/bash-completion.sh
rename to src/scripts/bash-completion.sh
diff --git a/src/extras/install_singularity.sh b/src/scripts/install_singularity.sh
similarity index 100%
rename from src/extras/install_singularity.sh
rename to src/scripts/install_singularity.sh