Merge branch 'refact_package' into 'master'

Refact package

See merge request !15
3 jobs for master in 0 seconds
Status Job ID Name Coverage
  External
passed install dependencies

00:00:07

passed other tests

00:00:00

passed unittesting modules

00:00:02