Moved non-essential views to view2 and daos to dao2.