Moved submodules under the inc folder