Update folder structure for packagegist, update contracts