Removing core, because now is a submodele
Added in submodules for removed folders