updated filenames
removed old file
Merge remote-tracking branch 'origin/master2' into develop