Refactor module organization
Bump for hackage