8 Commits (refactor/namespace-and-layering)