+ Refactoring of package structure