Renamed the file and made some structural changes.