Renamed some files
Updated comments