Reorganizing #1 (mostly Ban.java)