Moved aliases to their own file