gulp/npm setup, structuring changes