Update documentation and minor restructuring
Fixed version in documentation