Change data factory classes to modules

Changed data factory classes to modules
as they do not need instantiation.