updates to server and gulp for file paths, these will need to match final structure, this is just for consistency sake