Rewrite package

Package is not done yet.