Restructured component: new submodules