Move classes to own dictionary