Completed S2 in Haskell @ progp13 and re-structures files