Refactoring towards new structure
Continuing refactoring into correct packages.