Split out things into plugin files
Move aliases out into more manageable files