#master - split logic classes to their respective places