Changed the structure of some of the internal workings in order to
be able compile using an Ada 2005 compiler instead of an Ada 2012
only.