Organise Keys Further