Final moves of GUI classes to void-safe cluster.