Move aliases into separate file