Removed M-dash from code; fixed spelling
Moving most classes into their own files
Added better water handling