Remove duplicated directory
Merge branch 'master' into test