Replaced submodules with SOOMLA's submodules