* Mapped two unmapped classes and some villager stuff Signed-off-by: liach <liach@users.noreply.github.com> * optimize name Signed-off-by: liach <liach@users.noreply.github.com>