Restructure, fix up gulp tasks and fix bad paths in manifest