Rename Cell.java to ModelCell.java