Development: Finalise Folder Structure
#37
Merged
Development: Finalise Folder Structure
#37