V4.0 fix folder structure 2491

This is a first pass to fix up the demos and vapour issues. This doesn't fix the underlaying demos, but just sets it up for the new demo/submodule publishing as they start to be moved over
/cc @masterbee