Removed empty .cpp files. Renamed paired .h to .hpp