Package refactoring
Merge pull request #228 from droidstealth/fix-package-domains

Package refactoring