diff --git a/builder/Makefile b/builder/Makefile
index 2032a47..bf2582e 100644
--- a/builder/Makefile
+++ b/builder/Makefile
@@ -8,13 +8,8 @@ X_SIZES ?=22 24 28 32 40 48 56 64 72 80 88 96
 WIN_CANVAS_SIZE ?= 32
 WIN_SIZE ?= 24
 
-clean:
-	@python3 -m pip uninstall -y clickgen
-	@find -iname "*.pyc" -delete
-	@rm -rf applbuild/__pycache__
-
 setup: clean 
-	@python3 -m pip install clickgen==1.1.9 --user
+	@python3 -m pip install clickgen --user
 
 build: setup build.py
 	@python3 build.py --xsizes $(X_SIZES) --win-size $(WIN_SIZE) --win-canvas-size $(WIN_CANVAS_SIZE)
diff --git a/builder/build.py b/builder/build.py
index 0ac4964..d6ae0e3 100644
--- a/builder/build.py
+++ b/builder/build.py
@@ -4,8 +4,8 @@
 import argparse
 from pathlib import Path
 
-from applbuild.configure import get_config
-from applbuild.generator import build, wbuild, xbuild
+from src.configure import get_config
+from src.generator import build, wbuild, xbuild
 
 parser = argparse.ArgumentParser(
     prog="apple_builder",
diff --git a/builder/applbuild/__init__.py b/builder/src/__init__.py
similarity index 100%
rename from builder/applbuild/__init__.py
rename to builder/src/__init__.py
diff --git a/builder/applbuild/configure.py b/builder/src/configure.py
similarity index 100%
rename from builder/applbuild/configure.py
rename to builder/src/configure.py
diff --git a/builder/applbuild/constants.py b/builder/src/constants.py
similarity index 100%
rename from builder/applbuild/constants.py
rename to builder/src/constants.py
diff --git a/builder/applbuild/generator.py b/builder/src/generator.py
similarity index 100%
rename from builder/applbuild/generator.py
rename to builder/src/generator.py
diff --git a/builder/applbuild/symlinks.py b/builder/src/symlinks.py
similarity index 100%
rename from builder/applbuild/symlinks.py
rename to builder/src/symlinks.py