Added submodules and some stub code