Split into library
Added package