changed submodules to regularly included code