Tutorial: split S1 map into its own file
Renamed files for clarity
Merge util files