Reorganize directorys