Feature/now 210

Rework of the folder structure. Not all items have been moved to final destinations but getting this in earlier and settled will make it easier for everyone down the road and less merge conflicts (hopefully).