Match generator configs and dependencies to basic
Update basics submodule