rename files
Merge branch 'issue-51' into develop
rename services
Merge branch 'issue-52' into develop