Switched other projects to .hpp and cleaned up a bit