Make dir more flat to be consist with submodule