Code

Rework package configuration