Put ServiceState in the right namespaace