Refactor package structure to corresponding architecture layer.