Attempts at fixing directory structure

Windows is retarded
Merge