Reorganize gulpfile and change styles directory name
Fix a couple of errors
Remove junk