Put class in separate file.

Change-Id: I4308fd6344bea06c7aebb35b01e9a88398dc1269