File structure cleanup

[BipbopBohnfon]

Reorganized project directory to fix broken build.

Also Nick Cressy pushed some more progress into this branch.