Still rearranging

* Eliminate duplicate files in new projects
* Still need to fix namespaces
* Still need to make build
* Still need to rename