Refactoring + repackaging