User:Kaimi/Restructured Hogwarts

Books, video games, and films are all considered on this list.

First Floor

 * East Wing

Third Floor

 * Charms Corridor (connects with Third Floor Corridor)
 * Armoury
 * Trophy Room
 * Third-florr hall
 * Charms Classroom
 * Clock Tower Entrance
 * Library
 * Jinx Rooms
 * Third Floor Corridor
 * Defence Against the Dark Arts Classroom
 * Third Floor Storeroom

Fifth Floor

 * Fifth Floor Corridor
 * Art Classroom
 * Boys' lavatory
 * Fifth Floor hospital tower corridor
 * Muggle Studies Classroom
 * Music Classroom
 * Prefects' bathroom

Sixth Floor

 * Room of Rewards
 * Sixth Floor Corridor
 * Horace Slughorn's office
 * Ancient Studies Classroom
 * Glanmore Peakes' Corridor
 * East Wing

Seventh Floor

 * Seventh Floor Corridor
 * Arithmancy Classroom
 * Attic
 * Divination Classroom (located in the North Tower)
 * Sybill Trelawney's office
 * Fat Lady's Corridor
 * Gryffindor Common Room
 * Filius Flitwick's office (located in the West Tower)
 * Hall of Hexes (close to the Room of Requirement)
 * Knights' Room
 * North Wing (connects Seventh Floor Corridor on Fat Lady's Corridor)
 * Room of Requirement
 * Dark Tower topmost cell