Restructuring the code base.