spin-off package definition into separate file