some remaining tweaks to account for the new directory structure