Delete odd *.cpp files and refactor code

[re composite]