Feature/packaging maintenance