Reorganizing the code base