move xs utils into separate dir