Did some reorganizing of Level.java