merge rust-rendering-2 to master
restructuring
dockerfiles
merge
config format changes, client updates