Restructured client executable