GNR-18 update module paths
Merge branch 'hotfix/v1.0.1'