Refactors as subpackage