fix packages after refactoring