diff --git a/Earthfile b/Earthfile
index 2dfdc21a..fe7ee78a 100644
--- a/Earthfile
+++ b/Earthfile
@@ -205,7 +205,7 @@ run.n:
     COPY .git .git
     COPY src src
     COPY hx3compat hx3compat
-    COPY client.hxml haxelib.json .
+    COPY client.hxml each.hxml haxelib.json .
     RUN haxe client.hxml
     SAVE ARTIFACT run.n AS LOCAL run.n
 
@@ -214,7 +214,7 @@ haxelib-binary:
     COPY .git .git
     COPY src src
     COPY hx3compat hx3compat
-    COPY client_cpp.hxml haxelib.json .
+    COPY client_cpp.hxml each.hxml haxelib.json .
     RUN haxe client_cpp.hxml
     SAVE ARTIFACT haxelib AS LOCAL haxelib
 
@@ -359,7 +359,7 @@ haxelib-server-builder:
 
 haxelib-server-legacy:
     FROM +haxelib-server-builder
-    COPY server_legacy.hxml server_each.hxml .
+    COPY server_legacy.hxml server_each.hxml each.hxml .
     COPY src src
     COPY hx3compat hx3compat
     COPY www/legacy www/legacy
@@ -368,7 +368,7 @@ haxelib-server-legacy:
 
 haxelib-server-website:
     FROM +haxelib-server-builder
-    COPY server_website.hxml server_each.hxml .
+    COPY server_website.hxml server_each.hxml each.hxml .
     COPY src src
     COPY hx3compat hx3compat
     RUN haxe server_website.hxml
@@ -382,7 +382,7 @@ haxelib-server-website-highlighter:
 
 haxelib-server-tasks:
     FROM +haxelib-server-builder
-    COPY server_tasks.hxml server_each.hxml .
+    COPY server_tasks.hxml server_each.hxml each.hxml .
     COPY src src
     COPY hx3compat hx3compat
     RUN haxe server_tasks.hxml
@@ -390,7 +390,7 @@ haxelib-server-tasks:
 
 haxelib-server-api:
     FROM +haxelib-server-builder
-    COPY server_api.hxml server_each.hxml .
+    COPY server_api.hxml server_each.hxml each.hxml .
     COPY src src
     COPY hx3compat hx3compat
     RUN haxe server_api.hxml
diff --git a/client.hxml b/client.hxml
index e5a3ae3c..8ad91d4b 100644
--- a/client.hxml
+++ b/client.hxml
@@ -1,6 +1,6 @@
--cp src
--cp hx3compat/std
--cp hx4compat/std
--cp crypto/src
+-p src
+-p hx3compat/std
+-p hx4compat/std
+-p crypto/src
 -neko run.n
 -main haxelib.client.Main
diff --git a/client_cpp.hxml b/client_cpp.hxml
index c4bbaa45..0873c881 100644
--- a/client_cpp.hxml
+++ b/client_cpp.hxml
@@ -1,9 +1,6 @@
--cp src
--cp hx3compat/std
--cp hx4compat/std
--cp crypto/src
+each.hxml
 --cpp bin/cpp
--main haxelib.client.Main
+--main haxelib.client.Main
 -D destination=../../haxelib{EXESUFFIX}
 --dce full
 -D analyzer-optimize
diff --git a/client_legacy.hxml b/client_legacy.hxml
index b35394fe..cea40579 100644
--- a/client_legacy.hxml
+++ b/client_legacy.hxml
@@ -1,6 +1,3 @@
--cp src
--cp hx3compat/std
--cp hx4compat/std
--cp crypto/src
+each.hxml
 -neko bin/legacyhaxelib.n
 -main legacyhaxelib.Main
\ No newline at end of file
diff --git a/client_tests.hxml b/client_tests.hxml
index 38c61023..63d96aba 100644
--- a/client_tests.hxml
+++ b/client_tests.hxml
@@ -1,8 +1,5 @@
--p src
+each.hxml
 -p test
--p hx3compat/std
--p hx4compat/std
--p crypto/src
 --main HaxelibTests
 --debug
 --neko bin/test.n
diff --git a/each.hxml b/each.hxml
new file mode 100644
index 00000000..1442fc5a
--- /dev/null
+++ b/each.hxml
@@ -0,0 +1,4 @@
+-cp src
+-cp hx3compat/std
+-cp hx4compat/std
+-cp crypto/src
diff --git a/integration_tests.hxml b/integration_tests.hxml
index 37ab3b6e..418ac931 100644
--- a/integration_tests.hxml
+++ b/integration_tests.hxml
@@ -1,7 +1,4 @@
--cp src
--cp test
--lib hx3compat
--cp hx4compat/std
--cp crypto/src
+each.hxml
+-p test
 -main IntegrationTests
 -neko bin/integration_tests.n
\ No newline at end of file
diff --git a/package.hxml b/package.hxml
index 0531ad3e..1449485c 100755
--- a/package.hxml
+++ b/package.hxml
@@ -1,5 +1,2 @@
--cp src
--cp hx3compat/std
--cp hx4compat/std
--cp crypto/src
+-p src
 --run Package
\ No newline at end of file
diff --git a/server_each.hxml b/server_each.hxml
index aac31546..329e27b7 100644
--- a/server_each.hxml
+++ b/server_each.hxml
@@ -1,7 +1,4 @@
--cp src
--cp hx3compat/std
--cp hx4compat/std
--cp crypto/src
+each.hxml
 -lib ufront
 -lib ufront-mail:1.0.0-rc.4
 -lib ufront-ufadmin
diff --git a/server_gitrepo.hxml b/server_gitrepo.hxml
index 8a93ca92..b3276ec0 100644
--- a/server_gitrepo.hxml
+++ b/server_gitrepo.hxml
@@ -1,9 +1,6 @@
---class-path src
+each.hxml
 --class-path lib/dts2hx-generated
 --class-path lib/node-sys-db
---class-path hx3compat/std
---class-path hx4compat/std
---class-path crypto/src
 --library hxnodejs
 --library record-macros
 --js gitrepo.js
diff --git a/server_legacy.hxml b/server_legacy.hxml
index 3e559317..f522ee63 100644
--- a/server_legacy.hxml
+++ b/server_legacy.hxml
@@ -1,5 +1,4 @@
 server_each.hxml
--cp src
 -neko www/legacy/index.n
 -main legacyhaxelib.Site
 -lib hx2compat
diff --git a/src/Package.hx b/src/Package.hx
index d5ddc229..bf843520 100644
--- a/src/Package.hx
+++ b/src/Package.hx
@@ -5,7 +5,6 @@ import haxe.zip.Tools;
 
 import sys.io.File;
 import sys.FileSystem;
-import haxelib.client.Main.VERSION;
 import haxelib.Data.Infos;
 
 using StringTools;