Bugfix/#142 errors in edited text

Reverts most of the refactoring changes that have taken place in June since they produced a lot of errors. The new module name as well as some comments and new function names have been kept.

Has been tested with 16b00, which produced an XHTML.