diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..e69de29
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4ac9d8d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,51 @@
+# PowerShell Studio Files
+*.temppoint.*
+*.psproj.psbuild
+*.psbuild
+
+#VS Code Files
+*.vscode
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# =========================
+# Operating System Files
+# =========================
+
+# OSX
+# =========================
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
\ No newline at end of file
diff --git a/Modules/Backup-VCSA.psm1 b/Modules/Backup-VCSA/Backup-VCSA.psm1
similarity index 100%
rename from Modules/Backup-VCSA.psm1
rename to Modules/Backup-VCSA/Backup-VCSA.psm1
diff --git a/Modules/Get-NICDetails.psm1 b/Modules/Get-NICDetails/Get-NICDetails.psm1
similarity index 100%
rename from Modules/Get-NICDetails.psm1
rename to Modules/Get-NICDetails/Get-NICDetails.psm1
diff --git a/Modules/Get-NewAndRemovedVMs.psm1 b/Modules/Get-NewAndRemovedVMs/Get-NewAndRemovedVMs.psm1
similarity index 100%
rename from Modules/Get-NewAndRemovedVMs.psm1
rename to Modules/Get-NewAndRemovedVMs/Get-NewAndRemovedVMs.psm1
diff --git a/Modules/Get-VMmaxIOPS.psm1 b/Modules/Get-VMmaxIOPS/Get-VMmaxIOPS.psm1
similarity index 100%
rename from Modules/Get-VMmaxIOPS.psm1
rename to Modules/Get-VMmaxIOPS/Get-VMmaxIOPS.psm1
diff --git a/Modules/Konfig-ESXi.psm1 b/Modules/Konfig-ESXi/Konfig-ESXi.psm1
similarity index 100%
rename from Modules/Konfig-ESXi.psm1
rename to Modules/Konfig-ESXi/Konfig-ESXi.psm1
diff --git a/Modules/PSvLIMessage.psm1 b/Modules/PSvLIMessage/PSvLIMessage.psm1
similarity index 100%
rename from Modules/PSvLIMessage.psm1
rename to Modules/PSvLIMessage/PSvLIMessage.psm1
diff --git a/Modules/ProactiveHA.psm1 b/Modules/ProactiveHA/ProactiveHA.psm1
similarity index 100%
rename from Modules/ProactiveHA.psm1
rename to Modules/ProactiveHA/ProactiveHA.psm1
diff --git a/Modules/Recommend-Sizing.psm1 b/Modules/Recommend-Sizing/Recommend-Sizing.psm1
similarity index 100%
rename from Modules/Recommend-Sizing.psm1
rename to Modules/Recommend-Sizing/Recommend-Sizing.psm1
diff --git a/Modules/Set-CBT.psm1 b/Modules/Set-CBT/Set-CBT.psm1
similarity index 100%
rename from Modules/Set-CBT.psm1
rename to Modules/Set-CBT/Set-CBT.psm1
diff --git a/Modules/Start-UNMAP.psm1 b/Modules/Start-UNMAP/Start-UNMAP.psm1
similarity index 100%
rename from Modules/Start-UNMAP.psm1
rename to Modules/Start-UNMAP/Start-UNMAP.psm1
diff --git a/Modules/VAMI.psm1 b/Modules/VAMI/VAMI.psm1
similarity index 100%
rename from Modules/VAMI.psm1
rename to Modules/VAMI/VAMI.psm1
diff --git a/Modules/VCHA.psm1 b/Modules/VCHA/VCHA.psm1
similarity index 100%
rename from Modules/VCHA.psm1
rename to Modules/VCHA/VCHA.psm1
diff --git a/Modules/VMCPFunctions.psm1 b/Modules/VMCPFunctions/VMCPFunctions.psm1
similarity index 100%
rename from Modules/VMCPFunctions.psm1
rename to Modules/VMCPFunctions/VMCPFunctions.psm1
diff --git a/Modules/apply-hardening.psm1 b/Modules/apply-hardening/apply-hardening.psm1
similarity index 100%
rename from Modules/apply-hardening.psm1
rename to Modules/apply-hardening/apply-hardening.psm1
diff --git a/Modules/vSphere_Hardening_Assess_VM_v1a.psm1 b/Modules/vSphere_Hardening_Assess_VM_v1a/vSphere_Hardening_Assess_VM_v1a.psm1
similarity index 100%
rename from Modules/vSphere_Hardening_Assess_VM_v1a.psm1
rename to Modules/vSphere_Hardening_Assess_VM_v1a/vSphere_Hardening_Assess_VM_v1a.psm1