moved unit_s to SoI folder