diff --git a/starter-repository-definitions.yml b/starter-repository-definitions.yml
index b5377b7..a5bf63c 100644
--- a/starter-repository-definitions.yml
+++ b/starter-repository-definitions.yml
@@ -1,159 +1,32 @@
 - language: c
-  file_mappings:
-    - source: starter_templates/README.md
-      target: README.md
-    - source: starter_templates/codecrafters.yml
-      target: codecrafters.yml
-    - source: starter_templates/c/app/main.c
-      target: app/main.c
-    - source: starter_templates/c/Dockerfile
-      target: Dockerfile
-    - source: starter_templates/c/your_docker.sh
-      target: your_docker.sh
-    - source: starter_templates/.gitattributes
-      target: .gitattributes
   template_attributes:
     required_executable: "gcc"
     user_editable_file: "app/main.c"
-
 - language: go
-  file_mappings:
-    - source: starter_templates/README.md
-      target: README.md
-    - source: starter_templates/codecrafters.yml
-      target: codecrafters.yml
-    - source: starter_templates/go/app/main.go
-      target: app/main.go
-    - source: starter_templates/go/go.mod
-      target: go.mod
-    - source: starter_templates/go/go.sum
-      target: go.sum
-    - source: starter_templates/go/Dockerfile
-      target: Dockerfile
-    - source: starter_templates/go/your_docker.sh
-      target: your_docker.sh
-    - source: starter_templates/.gitattributes
-      target: .gitattributes
   template_attributes:
     required_executable: "go"
     user_editable_file: "app/main.go"
-
 - language: php
-  file_mappings:
-    - source: starter_templates/README.md
-      target: README.md
-    - source: starter_templates/codecrafters.yml
-      target: codecrafters.yml
-    - source: starter_templates/php/app/main.php
-      target: app/main.php
-    - source: starter_templates/php/Dockerfile
-      target: Dockerfile
-    - source: starter_templates/php/your_docker.sh
-      target: your_docker.sh
-    - source: starter_templates/.gitattributes
-      target: .gitattributes
   template_attributes:
     required_executable: "php (7.4)"
     user_editable_file: "app/main.php"
-
 - language: nim
-  file_mappings:
-    - source: starter_templates/README.md
-      target: README.md
-    - source: starter_templates/codecrafters.yml
-      target: codecrafters.yml
-    - source: starter_templates/nim/app/main.nim
-      target: app/main.nim
-    - source: starter_templates/nim/Dockerfile
-      target: Dockerfile
-    - source: starter_templates/nim/your_docker.sh
-      target: your_docker.sh
-    - source: starter_templates/.gitattributes
-      target: .gitattributes
   template_attributes:
     required_executable: "nim (1.0)"
     user_editable_file: "app/main.nim"
-
 - language: python
-  file_mappings:
-    - source: starter_templates/README.md
-      target: README.md
-    - source: starter_templates/codecrafters.yml
-      target: codecrafters.yml
-    - source: starter_templates/python/app/main.py
-      target: app/main.py
-    - source: starter_templates/python/Dockerfile
-      target: Dockerfile
-    - source: starter_templates/python/your_docker.sh
-      target: your_docker.sh
-    - source: starter_templates/python/.gitignore
-      target: .gitignore
-    - source: starter_templates/.gitattributes
-      target: .gitattributes
   template_attributes:
     required_executable: "python (3.x)"
     user_editable_file: "app/main.py"
-
 - language: rust
-  file_mappings:
-    - source: starter_templates/README.md
-      target: README.md
-    - source: starter_templates/codecrafters.yml
-      target: codecrafters.yml
-    - source: starter_templates/rust/.gitignore
-      target: .gitignore
-    - source: starter_templates/rust/src/main.rs
-      target: src/main.rs
-    - source: starter_templates/rust/Cargo.toml
-      target: Cargo.toml
-    - source: starter_templates/rust/Cargo.lock
-      target: Cargo.lock
-    - source: starter_templates/rust/Dockerfile
-      target: Dockerfile
-    - source: starter_templates/rust/your_docker.sh
-      target: your_docker.sh
-    - source: starter_templates/.gitattributes
-      target: .gitattributes
   template_attributes:
     required_executable: "cargo (1.54)"
     user_editable_file: "src/main.rs"
-
 - language: swift
-  file_mappings:
-    - source: starter_templates/README.md
-      target: README.md
-    - source: starter_templates/codecrafters.yml
-      target: codecrafters.yml
-    - source: starter_templates/swift/.gitignore
-      target: .gitignore
-    - source: starter_templates/swift/Sources/swift-docker-challenge/Main.swift
-      target: Sources/swift-docker-challenge/Main.swift
-    - source: starter_templates/swift/Package.swift
-      target: Package.swift
-    - source: starter_templates/swift/Dockerfile
-      target: Dockerfile
-    - source: starter_templates/swift/your_docker.sh
-      target: your_docker.sh
-    - source: starter_templates/.gitattributes
-      target: .gitattributes
   template_attributes:
     required_executable: "swift"
     user_editable_file: "Sources/swift-docker-challenge/Main.swift"
-
 - language: ruby
-  file_mappings:
-    - source: starter_templates/README.md
-      target: README.md
-    - source: starter_templates/codecrafters.yml
-      target: codecrafters.yml
-    - source: starter_templates/ruby/app/main.rb
-      target: app/main.rb
-    - source: starter_templates/ruby/Dockerfile
-      target: Dockerfile
-    - source: starter_templates/ruby/your_docker.sh
-      target: your_docker.sh
-    - source: starter_templates/.gitattributes
-      target: .gitattributes
   template_attributes:
     required_executable: "ruby (2.7)"
     user_editable_file: "app/main.rb"
diff --git a/starter_templates/.gitattributes b/starter_templates/all/code/.gitattributes
similarity index 100%
rename from starter_templates/.gitattributes
rename to starter_templates/all/code/.gitattributes
diff --git a/starter_templates/README.md b/starter_templates/all/code/README.md
similarity index 100%
rename from starter_templates/README.md
rename to starter_templates/all/code/README.md
diff --git a/starter_templates/codecrafters.yml b/starter_templates/all/code/codecrafters.yml
similarity index 100%
rename from starter_templates/codecrafters.yml
rename to starter_templates/all/code/codecrafters.yml