Back to inital commit
Revert "Back to inital commit"

This reverts commit 94e7c9433be62359a22eb27fce4bafbedfc973f2.
Revert "Additional Folder Structure Changes"

This reverts commit 5d9e684949a75d15ed227c9581484367f924ed65.
Folder Correction