[Sprint 2] java classes fixed