Make instruction factory to be separate part of the project. It makes the debugging code a more sane way to navigate into the code.