Continued cleaning the folder structure and gulp tasks