Switch to exec from package; include avalon-sample and avalon-dist::web in main manifest