Move services around

We now explicitly bind them in Bundler, since Rules is sort of stupid
Move users around

Again, Rules are stupid
Move groups
Get rid of more Rules