Added basics to submodule (structure update)