Refactoring part 2: the renaming strikes back

Deleted old files that were renamed