modified gulp & project structure