Package name moved to proper place