Revert "Revert "neuer aufbau""

This reverts commit 2a647e52e8245318d9cbf4af705c91e163b72b84.