Removed presenters, refactored models