Renamed files and added comments