Javadocs and reorganizing