Added AES, random and tiny restructure.