Reorganised, updated jformica