EF-21 Submodules returned to efforia folder