Rename to new module format
Merge branch 'master' of github.com:bartv/imp-graph