Code Restructuring