Revert "Restructure props folder"

This reverts commit 61252bd6404f198ba4fa302f128f0a5b04a68ff6.