Refactored package in core