Move around and clean up, begin breaking up OpenSim.Services.