Added allGo and aes aliases plus cleanly reorg