refine the package organization and namespace