Added gulp script and reorganized