[Refactoring] Refatoring package Data

fix unused h files