Javi - MUT-017 - Adding 5 week penalty, changing gulp tasks and folder s...

...tructure.