Restructure dirs.