Move a couple of classes into their own files

Change-Id: I7c20071936d12d6514fbb7ca4091da74a6269f82