updated modules and tidied layout and gulp workflow