Package refactoring (persistance added)