Fix structure
Steve's updates
Note
Configure client project
fix info
Tweaks
trivial