Merge "Moved the Cipher and Auth enums to exports directory"