Update gulp for notifying
Improve directory structure
Separate to some files