Added submodule, moved into classes