Reorganized Optimization Team's code