Added and corrected obsolete files
Added javadoc