Update indentation, etc.
Move AES cipher suites into a separate module.