Renamed some files and ensured they are working