well, theres an intresting story beding that, i looked all over the web for maps but the layout of the castle was different in every map as they are over the 7 films/book, games and lego games. so i just sort of imagined my version, obviously i knew that the great hall was next to the grand staircase tower, the quad was some were in the middle and that the clock tower and covered bridge were the oposite side, but the castle in my world isnt based on 1 map. I included things that are almost in the places they are in the films like the astronamy tower, the hospital wing. but i would just go with what you think because there is no map really showing all of a hogwarts that is correct
I found out later on that the reason everything moved, like the locations of the gryffindor common room, design of the courtyards, and all of that was so the director could change hogwarts in his image, and the stories excuse was that the school changed by using magic to do it. Pretty neat I think.