Architecture change (new modules concept)
Correct style and drop `root` directives in bundle.yml