DB Restructurization: step 2