refactoring packages, directories