Renamed files and changed file structure.