Complete code cleanup

Javadoc for everything
Namechanges to meet standards

Complete code reformat.