Moved some files around for neatnet
Moved some files around for neatness.

Moved some files around and fixed the build.