removed old files
Merge branch 'master' into refactor