v2 update with comments and better directory organization for the econ optimization project