Move things around AesSafe so that they make more sense; consolidate some code; Looking Good\!