Refactor packages and configuration files