Reorganizing #2 (Hub.java and general errors)