Ravenclaw and Astronomy Tower

Yes this is how its meant to be. In books entrance to ravenclaw is a wooden door with an eagle knocker that asks riddles. Im so happy how this is turning out

You could add dada classroom there to replace divination if you wanted as thats about right place, though i personally hope you recreate giant spiral stairs from the movies, half way up those theres a second bunch of stairs leading down to charms

Saying this to give you info and to be helpful not to in any way criticise. The divination tower is in west wing and is one of four towers bordering paved courtyard along with grand staircase tower, gryffindor tower and watchtower. I love your work