Updated gulp file and changed file structure