In the process of rewriting and reorganizing the code...