Restructure directories to arrange for category first search.