Separation of classes that were in the same file