Huge refactor using use-package