reorganized haskell files
reorganized code files