added gulp + reorganising all code