Rename NoblesAndWarriors_new.java to NoblesAndWarriors.java