*/
#include "angband.h"
-#include "core.h"
+#include "core/system-variables.h"
#include "core/show-file.h"
#include "gameterm.h"
#include "io/read-pref-file.h"
#include "cmd/cmd-help.h"
#include "dungeon/dungeon-file.h"
#include "dungeon/dungeon.h"
-#include "floor-town.h"
-#include "floor.h"
+#include "floor/floor-town.h"
+#include "floor/floor.h"
#include "history.h"
#include "io/write-diary.h"
#include "japanese.h"
#include "market/store.h"
-#include "monster.h"
-#include "monsterrace-hook.h"
-#include "monsterrace.h"
-#include "object-ego.h"
+#include "monster/monster.h"
+#include "monster/monsterrace-hook.h"
+#include "monster/monsterrace.h"
+#include "object/object-ego.h"
#include "object/object-kind.h"
#include "patron.h"
-#include "player-class.h"
-#include "player-personality.h"
-#include "player-sex.h"
-#include "player-skill.h"
-#include "player-status.h"
+#include "player/player-class.h"
+#include "player/player-personality.h"
+#include "player/player-sex.h"
+#include "player/player-skill.h"
+#include "player/player-status.h"
#include "player/process-name.h"
#include "player/race-info-table.h"
#include "quest.h"