Restructure file system

Restructuring File System
(Doing this without approval!)