Build system: Normal 'dist' now combines all package resources. 'dist-dev' loads everyhing as before