Finished refactoring packaging
Merge pull request #6 from RHInception/master

Finished refactoring packaging