Reorganize and some more javadocs