Folder directory restructured.