Merge pull request #11 from openwfm/restructure