refact

do dir refact