Merge branch 'feature/kszkep-23-refactoring' into 'dev'

Resolve "Átfaktorálás"

See merge request !18
4 jobs for dev in 3 minutes and 21 seconds (queued for 3 seconds)