Refactor packages
Code refactor