Spli Designs into 2 parallel versions
Revert "Spli Designs into 2 parallel versions"

This reverts commit 42eaffe06f4d6f8e476330e2d6c2b6b5f4536701.
Revert "Revert "Spli Designs into 2 parallel versions""

This reverts commit b580d7db8ba6dc8373a5b573116ba9034fe4eb40.