Move pilot classes to their own package