6 Commits (refactor/r01-structure-performance)