A factory is a singleton

So moving suspect singleton as a factory