Refactorization core submodules