Add some aliases, and structure