Fix/cleanup package and cmakelists

some more cleanup in cpp templates. Mainly fixing tabs vs spaces.