diff --git a/File Formats/Images/README.md b/File Formats/Images/README.md
deleted file mode 100644
index cea5966..0000000
--- a/File Formats/Images/README.md	
+++ /dev/null
@@ -1,13 +0,0 @@
-# Image File Formats
-
-## Official Recommendations
-
-Rather than creating your own format or using a lesser used/inefficient format, it is recommended to use the following formats based on your needs.
-
-**Images that require both text and colour in each pixel (advanced computers)**: [NitroFingers Text](todo)
-
-**Images that only require 1 colour per pixel**: [Universal Compressed Graphics Format](todo)
-
-## Proposal Requirements
-
-Image file format proposals must follow the [File Format proposal requirements](https://github.com/oeed/CraftOS-Standards/blob/master/File%20Formats/README.md#proposal-requirements).
diff --git a/File Formats/README.md b/File-Formats/README.md
similarity index 73%
rename from File Formats/README.md
rename to File-Formats/README.md
index 2169ecc..d40d159 100644
--- a/File Formats/README.md	
+++ b/File-Formats/README.md
@@ -2,6 +2,15 @@
 
 File formats are specific ways to store data that can be read and written using standardised methods.
 
+MIME Type | Name | Use Cases
+--------- | ---- | ---------
+[application/directory](application/directory.md) | Folder | Grouping files
+[image/nft](image/nft.md) | Nitrogen Fingers Text | Images that require both text and colour in each pixel (advanced computers)
+[image/paint](image/paint.md) | Paintutils Image | -
+[image/ucg](image/ucg.md) | Universal Compressed Graphics | Images that only require 1 colour per pixel
+[text/lua](text/lua.md) | Lua File | -
+[text/plain](text/plain.md) | Plain Text | -
+
 ## Proposal Requirements
 
 Every format must specify all of the following:
@@ -28,4 +37,9 @@ It is acceptable to create your category (bit before the slash). For example, Si
 
 ### Code to Read and Write
 
-You must create either an API, or if, the code is not very long, example code, to read and write your file format so others do not have to. However, your description of the format should be thorough enough for someone to do so without the API/example code.
\ No newline at end of file
+You must create either an API, or if, the code is not very long, example code, to read and write your file format so others do not have to. However, your description of the format should be thorough enough for someone to do so without the API/example code.
+
+- - - -
+
+
+[File Format Template](TEMPLATE.md)
diff --git a/Standard Proposal Guidelines.md b/File-Formats/TEMPLATE.md
similarity index 100%
rename from Standard Proposal Guidelines.md
rename to File-Formats/TEMPLATE.md
diff --git a/File Formats/Folder.md b/File-Formats/application/directory.md
similarity index 100%
rename from File Formats/Folder.md
rename to File-Formats/application/directory.md
diff --git a/File Formats/Images/Nitrogen Fingers Text.md b/File-Formats/image/nft.md
similarity index 100%
rename from File Formats/Images/Nitrogen Fingers Text.md
rename to File-Formats/image/nft.md
diff --git a/File Formats/Images/Paintutils Image Format.md b/File-Formats/image/paint.md
similarity index 100%
rename from File Formats/Images/Paintutils Image Format.md
rename to File-Formats/image/paint.md
diff --git a/File Formats/Images/Universal Compressed Graphics.md b/File-Formats/image/ucg.md
similarity index 100%
rename from File Formats/Images/Universal Compressed Graphics.md
rename to File-Formats/image/ucg.md
diff --git a/File Formats/Code/Lua.md b/File-Formats/text/lua.md
similarity index 100%
rename from File Formats/Code/Lua.md
rename to File-Formats/text/lua.md
diff --git a/File Formats/Documents/Plain Text.md b/File-Formats/text/plain.md
similarity index 100%
rename from File Formats/Documents/Plain Text.md
rename to File-Formats/text/plain.md