Structure and java doc

Major improvements to stucture and java docs