Switching Standard to be a submodule