move things into a module
Merge remote-tracking branch 'upstream/master'