Update gulpfile
Reorganize Jade files