Merge branch 'Bettermap'
Merge branch 'Bettermap'
Merge branch 'Bettermap'
Removed unused files
Solve naming problem step 1
solve naming problem step ii
Merge branch 'master' into Bettermap