- tests are running again
- refactored stuff in own modules
- heavy refactoring