Some name refactoring
Redundant files have been removed