Some refactoring and packaging changes
More refactoring