fixup! Move the key classes into the key package STUD-1625