Add watch task in gulp file + re-organize main file for client