Evidence would suggest it was intended to be the last dungeon you'd explore before Ganon's Castle, though, so some things do seem as though they were switched around in development.