Refactor packages and strings