diff --git a/config/config b/config/config
index cf35be8..8c56ac3 100644
--- a/config/config
+++ b/config/config
@@ -22,9 +22,8 @@ DEFAULT_ARCH="amd64"
 
 HOME_VINAIGRETTE="/home/vinaigrette"
 GIT_REPOS="$HOME_VINAIGRETTE/gitrepos/"
-BUILD_DEB="$HOME_VINAIGRETTE/build_deb"
 
-PBUILDER_HOME="$HOME_VINAIGRETTE/pbuilder/"
+PBUILDER_HOME="$HOME_VINAIGRETTE/scripts/pbuilder/"
 PBUILDER_IMAGES="$HOME_VINAIGRETTE/images/"
 PBUILDER_RESULTS="$PBUILDER_HOME/result"
 DAILY_PACKAGES="$PBUILDER_HOME/packages/"
@@ -34,6 +33,7 @@ PATATE_REPO_DIR=/var/www/repo/patate
 # Scripts
 
 BUILD_SOURCES="$PBUILDER_HOME/build-sources"
-INCLUDE_CHANGES="$HOME_VINAIGRETTE/repo/include-changes"
+BUILD_DEB="$HOME_VINAIGRETTE/scripts/build_deb"
+INCLUDE_CHANGES="$HOME_VINAIGRETTE/scripts/repo/include-changes"
 
 
diff --git a/config/distributions b/config/distributions
index a1d68b3..cada58e 100644
--- a/config/distributions
+++ b/config/distributions
@@ -11,7 +11,7 @@ Description: YunoHost repository for Debian Jessie
 SignWith: 59A3E6FF
 Tracking: all includechanges keepsources
 Log: logfile
- --changes --via=include /home/vinaigrette/repo/process-include
+ --changes --via=include /home/vinaigrette/scripts/repo/process-include
 
 Origin: YunoHost
 Label: YunoHost for Stretch
@@ -25,4 +25,4 @@ Description: YunoHost repository for Debian Stretch
 SignWith: 59A3E6FF
 Tracking: all includechanges keepsources
 Log: logfile
- --changes --via=include /home/vinaigrette/repo/process-include
+ --changes --via=include /home/vinaigrette/scripts/repo/process-include
diff --git a/config/rebuildd.conf b/config/rebuildd.conf
index b5826ab..180a43c 100644
--- a/config/rebuildd.conf
+++ b/config/rebuildd.conf
@@ -3,9 +3,9 @@ check_every = 30
 max_threads = 1
 max_jobs = 5
 kill_timeout = 90
-source_cmd = /home/vinaigrette/rebuildd/get-sources ${d} ${p} ${v}
-build_cmd = /home/vinaigrette/rebuildd/build-binaries ${d} ${p} ${v} ${a}
-post_build_cmd = /home/vinaigrette/rebuildd/upload-binaries ${d} ${p} ${v} ${a} ${j}
+source_cmd = /home/vinaigrette/scripts/rebuildd/get-sources ${d} ${p} ${v}
+build_cmd = /home/vinaigrette/scripts/rebuildd/build-binaries ${d} ${p} ${v} ${a}
+post_build_cmd = /home/vinaigrette/scripts/rebuildd/upload-binaries ${d} ${p} ${v} ${a} ${j}
 dists = jessie stretch
 work_dir = /var/cache/rebuildd/build
 database_uri = sqlite:///var/lib/rebuildd/rebuildd.db
diff --git a/config/sources.list b/config/sources.list
index 276aea6..69ff4f7 100644
--- a/config/sources.list
+++ b/config/sources.list
@@ -1,2 +1,2 @@
 deb-src http://repo.yunohost.org/debian jessie stable testing unstable extra
-#deb-src http://repo.yunohost.org/debian stretch extra
+deb-src http://repo.yunohost.org/debian stretch stable testing unstable extra
diff --git a/init.sh b/init.sh
index 1908e04..55ca063 100755
--- a/init.sh
+++ b/init.sh
@@ -21,7 +21,7 @@ ln -s $VINAIGRETTE_HOME/config/distributions /var/www/repo/debian/conf/distribut
 rm /etc/rebuildd/rebuilddrc
 ln -s $VINAIGRETTE_HOME/config/rebuildd.conf /etc/rebuildd/rebuilddrc
 
-ln -s $VINAIGRETTE_HOME/pbuilder/images /var/cache/pbuilder/images
+ln -s $VINAIGRETTE_HOME/images /var/cache/pbuilder/images
 ln -s /var/cache/pbuilder/result $PBUILDER_RESULTS
 cp $VINAIGRETTE_HOME/conf/nginx.conf /etc/nginx/sites-enabled/repo.conf
 
diff --git a/build_deb b/scripts/build_deb
similarity index 100%
rename from build_deb
rename to scripts/build_deb
diff --git a/package_helpers.sh b/scripts/package_helpers.sh
similarity index 100%
rename from package_helpers.sh
rename to scripts/package_helpers.sh
diff --git a/pbuilder/build-sources b/scripts/pbuilder/build-sources
similarity index 100%
rename from pbuilder/build-sources
rename to scripts/pbuilder/build-sources
diff --git a/rebuildd/build-binaries b/scripts/rebuildd/build-binaries
similarity index 96%
rename from rebuildd/build-binaries
rename to scripts/rebuildd/build-binaries
index 40403d9..e2f4069 100755
--- a/rebuildd/build-binaries
+++ b/scripts/rebuildd/build-binaries
@@ -6,7 +6,7 @@ version=$3
 arch=$4
 
 source /home/vinaigrette/config/config
-source /home/vinaigrette/package_helpers.sh
+source /home/vinaigrette/scripts/package_helpers.sh
 
 # Build only binary-only limited to architecture dependent packages
 DEBBUILDOPTS="-B"
diff --git a/rebuildd/get-sources b/scripts/rebuildd/get-sources
similarity index 100%
rename from rebuildd/get-sources
rename to scripts/rebuildd/get-sources
diff --git a/rebuildd/upload-binaries b/scripts/rebuildd/upload-binaries
similarity index 98%
rename from rebuildd/upload-binaries
rename to scripts/rebuildd/upload-binaries
index af31e90..b62618c 100755
--- a/rebuildd/upload-binaries
+++ b/scripts/rebuildd/upload-binaries
@@ -7,7 +7,7 @@ arch=$4
 job=$5
 
 source /home/vinaigrette/config/config
-source /home/vinaigrette/package_helpers.sh
+source /home/vinaigrette/scripts/package_helpers.sh
 XMPP_BOT_KEY=$(cat /home/vinaigrette/config/keys/xmppbotkey)
 
 # Repository codename to add package to
diff --git a/repo/include-changes b/scripts/repo/include-changes
similarity index 89%
rename from repo/include-changes
rename to scripts/repo/include-changes
index 2fee25f..eb03c1e 100755
--- a/repo/include-changes
+++ b/scripts/repo/include-changes
@@ -5,7 +5,7 @@ distribution=$2
 changes_file=$3
 
 source /home/vinaigrette/config/config
-source /home/vinaigrette/package_helpers.sh
+source /home/vinaigrette/scripts/package_helpers.sh
 
 sudo reprepro -C $distribution -V -b $REPO_DIR include $codename $changes_file
 RET=$?
diff --git a/repo/move-to-incoming b/scripts/repo/move-to-incoming
similarity index 91%
rename from repo/move-to-incoming
rename to scripts/repo/move-to-incoming
index c5a7fab..e2bd632 100755
--- a/repo/move-to-incoming
+++ b/scripts/repo/move-to-incoming
@@ -3,7 +3,7 @@
 changes_file=$1
 
 source /home/vinaigrette/config/config
-source /home/vinaigrette/package_helpers.sh
+source /home/vinaigrette/scripts/package_helpers.sh
 
 INCOMING_DIR=${REPO_DIR}/incoming
 
diff --git a/repo/process-include b/scripts/repo/process-include
similarity index 94%
rename from repo/process-include
rename to scripts/repo/process-include
index 59317c1..9f18069 100755
--- a/repo/process-include
+++ b/scripts/repo/process-include
@@ -7,7 +7,7 @@ version=$4
 changes_file=$5
 
 source /home/vinaigrette/config/config
-source /home/vinaigrette/package_helpers.sh
+source /home/vinaigrette/scripts/package_helpers.sh
  
 # Only care about packages being added
 if [[ $action != accepted ]]; then