refactering directory
Merge branch 'ver0.030'