Reorganized the code a bit to make it easier for code reuse
Reorganized the code a bit to make it easier for code reuse

fedora-conary/conary,fedora-conary/conary,fedora-conary/conary,fedora-conary/conary,fedora-conary/conary