Continued refinement of Gulpfile and directory reorg.