Extra a few things to their own files and move a few other things around.
Merge branch 'master' of github.com:christianlavoie/underground

Conflicts:
	src/Main.hs
	src/Types.hs