Renaming. And hasktags.
ignore hasktags output
tidying up a bit