refactoring packages and tests