Ruined Manor House with Vineyard

A dilapidated Manor House with a sinister history. Some say the owners went mad and killed their own family; others say that the wine is tainted by the corruption that lies in the cellar. In any case, no one goes there any more or do they?

In my game, this is a city villa with a small vineyard (credit to Morikahn's Vineyard).; a cliched murderhouse with a dark secret. Plan is to segue into the Shadowfell using the crypt as a gateway.

I've left some of the edging in from my larger city map, but can be quickly deleted to fit anywhere I guess.

Building layout:

Underground - has a wine cellar / roots cellar leading to an underground chapel. A secret passage leads to a reliquary, a family crypt and a spare room (maybe burial preparation, or an extension)
Ground Floor - Entrance hall & stair up AND a secret passage to the Cellars, small armour display place, reading room, dining room, small cloak/storage room, a secret shrine, study, wine press/bottlery, kitchen & stairs up.
Outside Grounds - a Solarium & a Groundskeeper shed with vineyard and garden.
Upper floor - 6 bedrooms (3 servants, 2 guest, 1 master), a small bathroom, and several private rooms (not all furnished)