Overhaul the java files