Revert "Change Folder Name to Default"

This reverts commit a0d79a7747f97553d40cee47b09aeac865639ef0.
Revert "Change File Structure"

This reverts commit 8997b22aa64c4c7a9d698213e32478d6cc5d3999.