Simplify include options handling in Main
Restrict the setters of configPackages, and reformat Main a little