Refactor

Refactor of packages