cleaned up duplicate folders
Merge branch 'master' into dm-working