CPASSREF: Updated makefiles for new directory structure