clusters reshaped to affinity groups

Signed-off-by: Ondrej Koch <o.koch@zerusnet.com>