Changes include to new directory structure