Restructurization: step 2