Cleaned up cluster package layout

Since it is in the javadoc -> javadoc.