Refactor Code, reduce global namespace pollution

[kaffarell]

The header files should only contain functions that have to accessible from the outside.