Renamed files & added comments