more aliases and restructure