multiple modules
rearranging packages
Merge branch 'release/1.0'