Adding flattened files from master