Oxygen ordering and Fe configuration in reduced and re-oxidized YBa2Cu3-xFexOy