More alias updates
Updated  aliases
Move aliases into separate file