Wrong files deleted
Revert "Wrong files deleted"

This reverts commit b4cec914c1f437d152d43ed4df05f6e3a2a5967c.
Fixed the design following the feedback from Roeland