First, E-R diagram of the current development model:

{{:devel:out.png|Database E-R Diagram}}

As can be seen, we will need to carry some changes in order to tidy it a bit. I will describe those here, as I come to them.