Adding split-package directive due some warnings