Moved aliases to its own file