fix folder structure for master branch