Refactored packages

Refactored package locations. Consolidate some packages.