Tidy up/add aliases, add accompanying scripts