Merge pull request #12382 from owncloud/enc_reorganize_folders2

apps/files_encryption/ajax/changeRecoveryPassword.php

apps/files_encryption/ajax/updatePrivateKeyPassword.php

apps/files_encryption/appinfo/update.php

apps/files_encryption/appinfo/version

apps/files_encryption/exception/encryptionException.php

apps/files_encryption/hooks/hooks.php

apps/files_encryption/lib/helper.php

apps/files_encryption/lib/keymanager.php

apps/files_encryption/lib/migration.php

apps/files_encryption/lib/proxy.php

apps/files_encryption/lib/session.php

apps/files_encryption/lib/util.php

apps/files_encryption/tests/crypt.php

apps/files_encryption/tests/helper.php

apps/files_encryption/tests/hooks.php

apps/files_encryption/tests/keymanager.php

apps/files_encryption/tests/migration.php

apps/files_encryption/tests/proxy.php

apps/files_encryption/tests/share.php

apps/files_encryption/tests/stream.php