[Refactoring] refactor package Layout