java doc and organization

I have been adding java doc and more organization to the project.
Conflict resolves