Update module directories
Merge branch 'develop'