fixed includes for new directory structure