diff --git a/.dockerignore b/.dockerignore
index e7ba514..52dcdec 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,10 @@
-.build
-.git
+# Folders
+/.build
+/.git
+/.swiftpm
+/.vscode
+
+# Files
 .gitignore
 Makefile
 README.md
diff --git a/.gitignore b/.gitignore
index edcd2d6..671b1a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-.DS_Store
+# Folders 
 /.build
 /.devContainer
 /.swiftpm
@@ -6,5 +6,8 @@
 /Packages
 /*.xcodeproj
 xcuserdata/
+
+# Files 
+.DS_Store
 .env.*
 .env
diff --git a/Test/Sources/Helpers/TestArguments.swift b/Test/Sources/Helpers/Models/TestArguments.swift
similarity index 100%
rename from Test/Sources/Helpers/TestArguments.swift
rename to Test/Sources/Helpers/Models/TestArguments.swift