Restructed directory layout.