Updated packaging files from 2.0.0 branch - NOTE: Not yet operative.