refactoring packages for CommonProject