Cleaned up cluster package layout

it would be good if getMember methods have javadoc.