Renamed some files for the sake of organisation