use rearrange_dirs branch for now