Reflect new submodule organization