restruct directories
update utils
restruct cmd