Changes to includes to reflect directory structure changes