The archive does need to be reorganized.
If you go to the shuttle gallery, you'll mostly see pictures of the ISS. If you go to the ISS gallery, you'll mostly see pictures of the shuttle. Instead of using the location of where the pictures were taken to decide which gallery to put them in, the subject matter should be the determining factor. If it's a photo of the ISS, regardless if it was taken on board the shuttle, it should be put in the ISS gallery. The same applies to pictures of the shuttle. Not having multiple postings of the same picture would also help decrease the size of it as well.