Conversion non-residential properties into affordable, self-contained rental housing units or bed-units