Reorganize files/directories in the contrib