Removing submodules and placing them in watchers
Fixing up brand