Some remaining code reorg.
Some remaining code reorg.

LalatenduMohanty/imagefactory,redhat-imaging/imagefactory,LalatenduMohanty/imagefactory,jmcabandara/imagefactory,jmcabandara/imagefactory,henrysher/imagefactory,redhat-imaging/imagefactory,henrysher/imagefactory