Started refactoring in main (default) pkg