Completed all changes in the restructuring pre debug.