Reformat repo's directory structure