This was all made in survival. I made a copy of the world so I could get a birds-eye view of the castle in Spectator mode.

(Correction: The wall below the Armory is a defense wall just like most others.)

I am thinking of making the Storage room a full rectangle as opposed to a weird pentagon thing as shown above. The orange square to the right of it is a staircase leading to an enchanting room and underground crop farm.

I might change the brewing and smelting room and servant's housing to something else or overhaul it.

I'll probably work on the dungeon last.