Refactoring: moved offline package to local package