Split into library and bundle