I think that on the first floor, where you put the entrance and lounge, there must be a spice store. And a lounge is not necessary. The kitchen is enough by itself. I don’t see how a couple of sofas and a TV fit in the decoration we are doing. XD
On the third floor a library would be better. On the second floor on the left the bedroom. And the secret trap door from the kitchen or from the mill mechanism.