Radical reorganization using use-package