modular: no functional changes. rearranged the gulp sequence