File restructuring and continued working on Labb2 in Haskell