Separate the core classes and modules