more tweaks to proj structure