Move package management into a separate file