Refactor gulpfile. Refactor src a bit