IExecutorService cleanup

Mostly checkstyle related fixes.

Also moved operations to operations package