Refactor optional user-requested packages to pillars.