Moved props to their own folders per function

Change-Id: I77d163997a99a39aee4bda002e796665b58867ff