package name moved to proper place