Cleanup unused files
Remainder of the renaming