Refactoring: code is better structured

Refactoring code to be better readable, testable and maintainable.

Closes #26 (closed)

I think I have checked every function, however please check that everything runs.

Feedback welcome : - )

FYI: I did not change the Authentication service, I hope that we will not need it as it is.