first stab at better gulp integration, moved a lot of things around