Moved Cell class to separate file- Reorganized