Move aliases into it's own file