Update and rename E2.cpp to E2_Incl_error.cpp