change MVC structure to add commentable
All tests pass