change imports for haskell 2010
move modules to our namespace
cleanup parser