Revert "Remove unused prop, move files correct place"

This reverts commit c025c315de0dfd956608f8780dfc1fa3747d5961.
We need little rework...