Refactoring: Rename core to Core