Restructuring the code base