Un-doing some of the distributed separation in prep for merge back into master. Dropping distributed architecture for now, but like the new file layout