Deutsches Historisches Museum in Berlin was good. There is new building behind the older one. Old one has two floors, upper floor has from ancient times to 1918. Lower floor has first and second war related material. New building has temporary exhibitions and you are not allowed to take pictures there. Buildings are connected with an underpass.