Package Fix

Fixed the package hierarchy. This should make things less messy.