Does the restructuring required for #184 . Does not yet contain all the changes requested by #184
There are now 5 sections: