rework on codebase layout

No match.