Got hlint working, rearranged source files