Moved custom menu type to folder models.
Changed some of the view models which were using the database models.