move token service to security namespace and remove service namespace