New Gulp build structure, cleanup components