reorganized file structure and gulp file config