Refact package

Federico Sismondirequested to merge
refact_package into master

Merge request reports