Renamed, fixed, moved, and commented