Restored proper package name hierarchy as it somehow got mangled when moving things back