Reorganizing #3 (Infractions.java and general errors)