Large parts of the state of Bavaria has non-Bavarians like Franconians and Swabians. Were there any efforts by Allied powers or Germany to restructure the state to better fit these cultural borders?