Restructure zp modules