FIxing javadoc, imports and inner classes