Diide-and-conquer: The CollectivePanel moved to a single file + more code refactoring.