update directory hierarchy
fix load path