BlueJ diagram reorganised