Changed ALL factory classes to modules