diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index fa5b1740..00000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/.github/issue_template.md b/.github/issue_template.md
deleted file mode 100644
index 25620a54..00000000
--- a/.github/issue_template.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Please follow the general troubleshooting steps first:
-
-- [ ] Have you checked to ensure there aren't other open [Issues](../../../issues) for the same issue?
-
-### Bug reports:
-
-Please replace this line with a brief summary of your issue.
diff --git a/.github/pull_request_map_template.md b/.github/pull_request_map_template.md
deleted file mode 100644
index ecc8a117..00000000
--- a/.github/pull_request_map_template.md
+++ /dev/null
@@ -1,15 +0,0 @@
-### All Submissions:
-
-- [ ] Have you checked to ensure there aren't any other maps that are alike or similar to the PR?
-- [ ] Have you checked to ensure there aren't other open [Pull Requests](../../../pulls) for the same update/change?
-
-### Tested Changes:
-
-1. [ ] Have you lint your code (lua lint) locally prior to submission?
-
-### Changes to Core Features:
-
-- [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
-- [ ] Have you successfully ran tests with your changes locally?
-
-### Comments
diff --git a/.github/pull_request_module_template.md b/.github/pull_request_module_template.md
deleted file mode 100644
index 23051142..00000000
--- a/.github/pull_request_module_template.md
+++ /dev/null
@@ -1,15 +0,0 @@
-### All Submissions:
-
-- [ ] Have you checked to ensure there aren't any other modules that are alike or similar to the PR?
-- [ ] Have you checked to ensure there aren't other open [Pull Requests](../../../pulls) for the same update/change?
-
-### Tested Changes:
-
-1. [ ] Have you lint your code (lua lint) locally prior to submission?
-
-### Changes to Core Features:
-
-- [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
-- [ ] Have you successfully ran tests with your changes locally?
-
-### Comments
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
deleted file mode 100644
index 6aa4d3ad..00000000
--- a/.github/pull_request_template.md
+++ /dev/null
@@ -1,14 +0,0 @@
-### All Submissions:
-
-- [ ] Have you checked to ensure there aren't other open [Pull Requests](../../../pulls) for the same update/change?
-
-### Tested Changes:
-
-1. [ ] Have you lint your code (lua lint) locally prior to submission?
-
-### Changes to Core Features:
-
-- [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
-- [ ] Have you successfully ran tests with your changes locally?
-
-### Comments
diff --git a/.github/stale.yml b/.github/stale.yml
deleted file mode 100644
index dc90e5a1..00000000
--- a/.github/stale.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-# Label to use when marking an issue as stale
-staleLabel: wontfix
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
deleted file mode 100644
index 7267d291..00000000
--- a/.github/workflows/CI.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: CI
-
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the develop branch
-on:
-  push:
-    branches: [develop]
-  pull_request:
-    branches: [develop]
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-
-      # Use "Factorio Mod luacheck" from the marketplace
-      - name: Factorio Mod luacheck
-        uses: Roang-zero1/factorio-mod-luacheck@v1.1.0
-        with:
-          # URL to the luacheckrc configuration file to be used during checking.
-          # Per https://github.com/Roang-zero1/factorio-mod-luacheck/issues/2 - an empty string will use the project's .luacheckrc
-          luacheckrc_url: 'https://raw.githubusercontent.com/ComfyFactory/ComfyFactorio/develop/.luacheckrc' # optional, default is https://raw.githubusercontent.com/Nexela/Factorio-luacheckrc/0.17/.luacheckrc
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 900e5dc6..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.vscode/
-.history/
-.git/
-**/.DS_Store
\ No newline at end of file
diff --git a/MacOS.gitignore b/MacOS.gitignore
new file mode 100644
index 00000000..635d5837
--- /dev/null
+++ b/MacOS.gitignore
@@ -0,0 +1,30 @@
+.vscode/
+.history/
+.git/
+
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
\ No newline at end of file
diff --git a/locale/.DS_Store b/locale/.DS_Store
deleted file mode 100644
index 66490417..00000000
Binary files a/locale/.DS_Store and /dev/null differ
diff --git a/maps/.DS_Store b/maps/.DS_Store
deleted file mode 100644
index 8fa4ed02..00000000
Binary files a/maps/.DS_Store and /dev/null differ
diff --git a/maps/pirates/.DS_Store b/maps/pirates/.DS_Store
deleted file mode 100644
index 5792f33e..00000000
Binary files a/maps/pirates/.DS_Store and /dev/null differ
diff --git a/maps/pirates/images/.DS_Store b/maps/pirates/images/.DS_Store
deleted file mode 100644
index ff04375f..00000000
Binary files a/maps/pirates/images/.DS_Store and /dev/null differ
diff --git a/maps/pirates/noise_pregen/.DS_Store b/maps/pirates/noise_pregen/.DS_Store
deleted file mode 100644
index 5008ddfc..00000000
Binary files a/maps/pirates/noise_pregen/.DS_Store and /dev/null differ
diff --git a/maps/pirates/structures/.DS_Store b/maps/pirates/structures/.DS_Store
deleted file mode 100644
index e3dabe21..00000000
Binary files a/maps/pirates/structures/.DS_Store and /dev/null differ
diff --git a/maps/pirates/structures/island_structures/.DS_Store b/maps/pirates/structures/island_structures/.DS_Store
deleted file mode 100644
index 3560c75f..00000000
Binary files a/maps/pirates/structures/island_structures/.DS_Store and /dev/null differ