Refactor package to make code compile again