refactoring: detector and types now outside (in run)
Merge pull request #9 from Dobr1802/code

refactoring: detector and types now outside (in run)