Refactor Executor into the main package for great winning