Add inheritance comments
Add inheritance comments
Restructurization: step 1