Renamed some files and classes
Merge branch 'develop'