separating Unit and Cell classes into own files