Package control refactor