Minor refactoring
Renamed files