Modified files to reflect new include directory structure (not fully working yet).