ref: refs/heads/refactor/layered-structure-simplified
