Extract some classes to their own files