Housing non-profit returning to Baltimore after causing City Hall commotion