Renamed some files, simplified code