Renamed files and refactored