Removed RecyclerView
Refactoring base classes for models