Some refactoring. Not finished!
Merge pull request #15 from KB50-G1/feature/design-refactoring

Some refactoring. Not finished!