Move definitions to a separate file
Move more package related code to setup-packages
Clarify
Move stuff around to more logical locations