Conversion and new build of commercial unit into apartments and shop