big refactoring, deleted many old classes not needed anymore and moved all definitely old classes in one package