Start splitting into saner modules
Merge branch 'master' of https://github.com/j201/sashimi