Big tidy of ABC structure, but new code still in cluster project
Refactor Cluster ABC stuff back into main packages