Cleaned up cluster package layout

Good point. But I'll leave that for the next rounds of cleanup on cluster. This PR is mostly about moving classes to the right packages.