Feature/packaging prep