diff --git a/fetcher.py b/client/fetcher.py
similarity index 100%
rename from fetcher.py
rename to client/fetcher.py
diff --git a/build_image.py b/server/build_image.py
similarity index 100%
rename from build_image.py
rename to server/build_image.py
diff --git a/build_manifest.py b/server/build_manifest.py
similarity index 100%
rename from build_manifest.py
rename to server/build_manifest.py
diff --git a/wrap_file.py b/server/wrap_file.py
similarity index 100%
rename from wrap_file.py
rename to server/wrap_file.py