Move connectivity classes to their own package