Renamed files and reorganised project