Restructuring finished. Disabled debug output to console.