Fixed some gulp file issues as well as reorganized the directory structure