Reorder benches
Rename package