Restructure client code layout.