should not have put everything into one package. Punkt/Strecke conflicts