Rewrite to package