Fixed indentation.
Renamed some files.