Move aliases out of aliases file