Restructuring code base