Initial basic refactoring. Got rid of all javadoc that were redundant, and small changes to naming and coherence with code conventions etc.