Refactor client code & add more gulp tasks
Remove test for now