Once you have left the cistern, and gone back to the main entrance, follow the path on your right all the way up through the stairs and stone ramp. When you find an arched stone door pass through it and you will find the castle keep, right after the stairs.