Revert "Merged housing have and need content types, views"

This reverts commit 7ded921e03cee5c8247562798574368aa8d24bc3.

This was intended for the housing branch. Reverting for now. Not ready for
master branch.