Renamed files, added comments