Historic schoolhouse incorporated into new building