Update 4

Refactoring code to a different set of packages.