changed file structure for master branch