reorganise Keystore.Interactive => Keystore, etc.