This is mainly moving a few store methods around. Note that this doesn't yet remove the replication servlet to avoid breaking during rollout.