Restructuring and added AES192 & AES256