Reorganize the directory structure