Removed Cell class and extracted Type enum into own file.