Move seperate operation pieces into own classes Bug: 8141918 Change-Id: Iacb15ceca5431136051e815aa71617eef89b9fe9