In progress work to close Issue 14, the directory structure is now preserved for headers being copied in, need to update specs to match