Move independent classes to separate files.