Reorganise init-haskell
Merge remote-tracking branch 'origin/master'