Starting the restructuring of the conceptual/implementation parts
Revised until chapter 4