Packages re-factored.
Simple intuitive packages.