Fix .props
Remove extraneous dependecies
Organize headers