First round for reorg of public methods, and removed all javadocs
temporarily.