Restructuring for reuse