Restructured the Gatherer class to more standard form.
Merge origin/master
Added Javadoc information to the gatherer class
Added more documentation