changed haskell file organisation
added scala files
final haskell changes