Fixed controller submodule mapping