refactoring project/package structure