Renaming module and file
Merge branch 'hotfix/V_0.1.1'