My answer is based on researching AFMAN 65-605v1 Chapter 8, Section 8b and the DoDFMR7000.14-R, Volume 2B, Chapter 5, paragraph 050201.

Without knowing all of the specifics, it appears that 3010 funding is appropriate for this effort. But because there is a slight chance that a nuance with your paricular redesign effort may make it more appropriate to fund with RDT&E funds; I strongly suggest you consult with your Program Office, Financial Management, and Fiscal Law subject matter experts. Together you should be able to confirm the correct funding source and avoid violating the Missapropriations Act (Title 31 U.S.C. Sec 1301).