Various package manipulations
Refactoring - moving core files to own module