Refactor Operation class to a new package