Refactor - Use naming convention haskell-pack/