Migrate to bin/package