At least for some of these cases there are good reasons for not including the files, e.g. in some cases these files are relevant only for GNAT 3. I would recommend holding off uploading any files until we complete the initial merge, because otherwise things will be inconsistent. When the merge is complete, we can review additional files that make sense to move.