Last commit before moving to cmake, restructuring files.