more refacoring
removed javadoc files