Restructoring the code base.