restructure for production