new structure for 1.0.0