Restructure directory diagram