Re-organise classes