Now all functions, which were "contained" in anoter one are moved
to seperate modules. This allows for strict interface checking and
debugging