diff --git a/Makefile b/Makefile
index 61e6383a..9fef9ebb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
-OUT := $(notdir $(realpath .))
-PKG := stuvel.eu/flamenco-test/goja
+OUT := flamenco-goja-poc
+PKG := stuvel.eu/flamenco-test/goja/cmd/flamenco-goja-poc
 VERSION := $(shell git describe --tags --dirty --always)
 PKG_LIST := $(shell go list ${PKG}/... | grep -v /vendor/)
 STATIC_OUT := ${OUT}-${VERSION}
 PACKAGE_PATH := dist/${OUT}-${VERSION}
 
-LDFLAGS := -X ${PKG}/appinfo.ApplicationVersion=${VERSION}
+LDFLAGS := -X stuvel.eu/flamenco-test/goja/internal/appinfo.ApplicationVersion=${VERSION}
 BUILD_FLAGS = -ldflags="${LDFLAGS}"
 
 ifndef PACKAGE_PATH
diff --git a/main.go b/cmd/flamenco-goja-poc/main.go
similarity index 85%
rename from main.go
rename to cmd/flamenco-goja-poc/main.go
index 8a02feb5..a3b50ce7 100644
--- a/main.go
+++ b/cmd/flamenco-goja-poc/main.go
@@ -6,8 +6,8 @@ import (
 	"github.com/mattn/go-colorable"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
-	"stuvel.eu/flamenco-test/goja/appinfo"
-	"stuvel.eu/flamenco-test/goja/job_compilers"
+	"stuvel.eu/flamenco-test/goja/internal/appinfo"
+	"stuvel.eu/flamenco-test/goja/internal/job_compilers"
 )
 
 func main() {
diff --git a/flamenco-goja-poc b/flamenco-goja-poc
new file mode 100755
index 00000000..083962e9
Binary files /dev/null and b/flamenco-goja-poc differ
diff --git a/appinfo/appinfo.go b/internal/appinfo/appinfo.go
similarity index 100%
rename from appinfo/appinfo.go
rename to internal/appinfo/appinfo.go
diff --git a/job_compilers/author.go b/internal/job_compilers/author.go
similarity index 100%
rename from job_compilers/author.go
rename to internal/job_compilers/author.go
diff --git a/job_compilers/job_compilers.go b/internal/job_compilers/job_compilers.go
similarity index 100%
rename from job_compilers/job_compilers.go
rename to internal/job_compilers/job_compilers.go
diff --git a/job_compilers/path.go b/internal/job_compilers/path.go
similarity index 100%
rename from job_compilers/path.go
rename to internal/job_compilers/path.go
diff --git a/job_compilers/path_test.go b/internal/job_compilers/path_test.go
similarity index 100%
rename from job_compilers/path_test.go
rename to internal/job_compilers/path_test.go
diff --git a/job_compilers/process.go b/internal/job_compilers/process.go
similarity index 100%
rename from job_compilers/process.go
rename to internal/job_compilers/process.go
diff --git a/job_compilers/scripts.go b/internal/job_compilers/scripts.go
similarity index 100%
rename from job_compilers/scripts.go
rename to internal/job_compilers/scripts.go
diff --git a/job_compilers/scripts/simple_blender_render.js b/internal/job_compilers/scripts/simple_blender_render.js
similarity index 100%
rename from job_compilers/scripts/simple_blender_render.js
rename to internal/job_compilers/scripts/simple_blender_render.js