Reorganizing code and updating vendors