Moved all aliases to a seperate file