Merge pull request #17 from openwfm/restructure