The PropertyAccessor should also be in the subdir.
Need to add the ProjectDir to the list of includes since we are now using subdirectories.
Need to refer to this using a more fully qualified path.