[Refactoring] Refactoring package Core

fix unused h files