renamed Capitalized folder names
Merge branch 'master' into user-register