Restructure project for the optimizer