rearrange to more normal haskell project layout
unify intending and tabbing