Moved executor to a separate package