Made the module into a package, some re-org