Quite big package refactoring