directory restructuring and gulp improvements