restructure to meet requirements