Reorganise structure and tidy up cmake

The directory structure for the project is non-standard, so this tidies this up. Also removes some of the cmake junk that has built up over the years.