Cleaned up cluster package layout

what needs to be improved? JavaDoc? implementation? design?