#112 | organizing executor code