Co-authored-by: Lilli Berthold <lilli.berthold@outlook.de> Reviewed-on: #238
- move out shared functions to shared templates - remove useless classes - simplify - various cleanups & enhancements