Updated: Module structure
Fixed syntax error
Merge branch 'develop'