Made javadoc FAR more description and package reoganization