Restructurization: step 1