diff --git a/src/arguments.cc b/src/arguments.cc
index c78531f..975c0c5 100644
--- a/src/arguments.cc
+++ b/src/arguments.cc
@@ -7,12 +7,12 @@
 #include <sstream>
 
 #include "constants.h"
-#include "input/file_input.h"
-#include "output/file_output.h"
-#include "input/console_input.h"
-#include "output/console_output.h"
-#include "input/curses_input.h"
-#include "output/curses_output.h"
+#include "file_input.h"
+#include "file_output.h"
+#include "console_input.h"
+#include "console_output.h"
+#include "curses_input.h"
+#include "curses_output.h"
 #include "rng.h"
 
 feature proc_args(int argc, char **argv,
diff --git a/src/player/assassin.cc b/src/assassin.cc
similarity index 96%
rename from src/player/assassin.cc
rename to src/assassin.cc
index 3be4ad3..a5a9a65 100644
--- a/src/player/assassin.cc
+++ b/src/assassin.cc
@@ -1,6 +1,6 @@
 #include "assassin.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 assassin::assassin(RNG *rng, const feature enabled_features):
         player_base{rng, enabled_features, race::ASSASSIN} {};
diff --git a/src/player/assassin.h b/src/assassin.h
similarity index 94%
rename from src/player/assassin.h
rename to src/assassin.h
index d3036ba..ee33417 100644
--- a/src/player/assassin.h
+++ b/src/assassin.h
@@ -1,7 +1,7 @@
 #ifndef __ASSASSIN_H__
 #define __ASSASSIN_H__
 
-#include "../player.h"
+#include "player.h"
 
 class assassin final: public player_base {
         inline static const fraction INF_HIT_RATE = {0x3F3F3F3F, 1};
diff --git a/src/enemies/baby_dragon.cc b/src/baby_dragon.cc
similarity index 94%
rename from src/enemies/baby_dragon.cc
rename to src/baby_dragon.cc
index d599008..82d568d 100644
--- a/src/enemies/baby_dragon.cc
+++ b/src/baby_dragon.cc
@@ -1,6 +1,6 @@
 #include "baby_dragon.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 baby_dragon::baby_dragon(RNG *rng, const feature enabled_features,
                          const position &pos, const int gen_room_num):
diff --git a/src/enemies/baby_dragon.h b/src/baby_dragon.h
similarity index 94%
rename from src/enemies/baby_dragon.h
rename to src/baby_dragon.h
index f582f4d..63d0c6e 100644
--- a/src/enemies/baby_dragon.h
+++ b/src/baby_dragon.h
@@ -1,7 +1,7 @@
 #ifndef __BABY_DRAGON_H__
 #define __BABY_DRAGON_H__
 
-#include "../enemy.h"
+#include "enemy.h"
 
 class baby_dragon final: public enemy_base {
 public:
diff --git a/src/potions/berzerk_brew.cc b/src/berzerk_brew.cc
similarity index 96%
rename from src/potions/berzerk_brew.cc
rename to src/berzerk_brew.cc
index c132acd..249d3ad 100644
--- a/src/potions/berzerk_brew.cc
+++ b/src/berzerk_brew.cc
@@ -1,7 +1,7 @@
 #include "berzerk_brew.h"
 
 #include <algorithm>
-#include "../constants.h"
+#include "constants.h"
 
 berzerk_brew::berzerk_brew(const position &pos):
         potion{potion_type::BERZERK_BREW, DURATION, pos} {}
diff --git a/src/potions/berzerk_brew.h b/src/berzerk_brew.h
similarity index 95%
rename from src/potions/berzerk_brew.h
rename to src/berzerk_brew.h
index 7942298..595401d 100644
--- a/src/potions/berzerk_brew.h
+++ b/src/berzerk_brew.h
@@ -1,7 +1,7 @@
 #ifndef __BERZERK_BREW_H__
 #define __BERZERK_BREW_H__
 
-#include "../potion.h"
+#include "potion.h"
 
 class berzerk_brew final: public potion {
         static const int ATK_MUL = 2;
diff --git a/src/potions/boost_atk.cc b/src/boost_atk.cc
similarity index 96%
rename from src/potions/boost_atk.cc
rename to src/boost_atk.cc
index e8738ac..55b41c6 100644
--- a/src/potions/boost_atk.cc
+++ b/src/boost_atk.cc
@@ -1,7 +1,7 @@
 #include "boost_atk.h"
 
 #include <algorithm>
-#include "../constants.h"
+#include "constants.h"
 
 
 
diff --git a/src/potions/boost_atk.h b/src/boost_atk.h
similarity index 94%
rename from src/potions/boost_atk.h
rename to src/boost_atk.h
index ad8740d..7480152 100644
--- a/src/potions/boost_atk.h
+++ b/src/boost_atk.h
@@ -1,7 +1,7 @@
 #ifndef __BOOST_ATK_H__
 #define __BOOST_ATK_H__
 
-#include "../potion.h"
+#include "potion.h"
 
 class boost_atk final: public potion {
         static const int BOOST_ATK = 5;
diff --git a/src/potions/boost_def.cc b/src/boost_def.cc
similarity index 96%
rename from src/potions/boost_def.cc
rename to src/boost_def.cc
index b7ed65b..8a03a74 100644
--- a/src/potions/boost_def.cc
+++ b/src/boost_def.cc
@@ -1,7 +1,7 @@
 #include "boost_def.h"
 
 #include <algorithm>
-#include "../constants.h"
+#include "constants.h"
 
 
 boost_def::boost_def(const position &pos):
diff --git a/src/potions/boost_def.h b/src/boost_def.h
similarity index 94%
rename from src/potions/boost_def.h
rename to src/boost_def.h
index cd0d1f2..c5e714f 100644
--- a/src/potions/boost_def.h
+++ b/src/boost_def.h
@@ -1,7 +1,7 @@
 #ifndef __BOOST_DEF_H__
 #define __BOOST_DEF_H__
 
-#include "../potion.h"
+#include "potion.h"
 
 class boost_def final: public potion {
         static const int BOOST_DEF = 5;
diff --git a/src/potions/borrow_life.cc b/src/borrow_life.cc
similarity index 96%
rename from src/potions/borrow_life.cc
rename to src/borrow_life.cc
index f7411b6..515c76d 100644
--- a/src/potions/borrow_life.cc
+++ b/src/borrow_life.cc
@@ -1,7 +1,7 @@
 #include "borrow_life.h"
 
 #include <algorithm>
-#include "../constants.h"
+#include "constants.h"
 
 borrow_life::borrow_life(const position &pos):
         potion{potion_type::BORROW_LIFE, DURATION, pos} {}
diff --git a/src/potions/borrow_life.h b/src/borrow_life.h
similarity index 95%
rename from src/potions/borrow_life.h
rename to src/borrow_life.h
index 847c34f..04d12bd 100644
--- a/src/potions/borrow_life.h
+++ b/src/borrow_life.h
@@ -1,7 +1,7 @@
 #ifndef __BORROW_LIFE_H__
 #define __BORROW_LIFE_H__
 
-#include "../potion.h"
+#include "potion.h"
 
 class borrow_life final: public potion {
         static const int GIVE_HP = 50;
diff --git a/src/player/brawler.cc b/src/brawler.cc
similarity index 97%
rename from src/player/brawler.cc
rename to src/brawler.cc
index cf5b019..ab80d18 100644
--- a/src/player/brawler.cc
+++ b/src/brawler.cc
@@ -1,6 +1,6 @@
 #include "brawler.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 brawler::brawler(RNG *rng, const feature enabled_features):
         player_base{rng, enabled_features, race::BRAWLER} {};
diff --git a/src/player/brawler.h b/src/brawler.h
similarity index 92%
rename from src/player/brawler.h
rename to src/brawler.h
index 5422b07..0927ca5 100644
--- a/src/player/brawler.h
+++ b/src/brawler.h
@@ -1,7 +1,7 @@
 #ifndef __BRAWLER_H__
 #define __BRAWLER_H__
 
-#include "../player.h"
+#include "player.h"
 
 class brawler final: public player_base {
 public:
diff --git a/src/input/console_input.cc b/src/console_input.cc
similarity index 98%
rename from src/input/console_input.cc
rename to src/console_input.cc
index 8b29634..5382947 100644
--- a/src/input/console_input.cc
+++ b/src/console_input.cc
@@ -2,7 +2,7 @@
 
 #include <utility>
 #include <string>
-#include "../constants.h"
+#include "constants.h"
 
 console_input::console_input(std::istream &cin):
         in{cin} {}
diff --git a/src/input/console_input.h b/src/console_input.h
similarity index 92%
rename from src/input/console_input.h
rename to src/console_input.h
index 4888d0c..4ec4ffe 100644
--- a/src/input/console_input.h
+++ b/src/console_input.h
@@ -2,7 +2,7 @@
 #define __CONSOLE_INPUT_H__
 
 #include <iostream>
-#include "../input.h"
+#include "input.h"
 
 class console_input final : public input {
 private:
diff --git a/src/output/console_output.cc b/src/console_output.cc
similarity index 99%
rename from src/output/console_output.cc
rename to src/console_output.cc
index 8aa3c83..7e7c7b2 100644
--- a/src/output/console_output.cc
+++ b/src/console_output.cc
@@ -4,7 +4,7 @@
 #include <utility>
 #include <ncurses.h>
 
-#include "../constants.h"
+#include "constants.h"
 
 console_output::console_output(std::ostream &cout): out{cout} {}
 
diff --git a/src/output/console_output.h b/src/console_output.h
similarity index 95%
rename from src/output/console_output.h
rename to src/console_output.h
index c8dbfd1..a3c89fa 100644
--- a/src/output/console_output.h
+++ b/src/console_output.h
@@ -2,7 +2,7 @@
 #define __CONSOLE_OUTPUT_H__
 
 #include <iostream>
-#include "../output.h"
+#include "output.h"
 
 class console_output final : public output {
 private:
diff --git a/src/potions/continuous_restoration.cc b/src/continuous_restoration.cc
similarity index 97%
rename from src/potions/continuous_restoration.cc
rename to src/continuous_restoration.cc
index 377f62f..38b039a 100644
--- a/src/potions/continuous_restoration.cc
+++ b/src/continuous_restoration.cc
@@ -1,7 +1,7 @@
 #include "continuous_restoration.h"
 
 #include <algorithm>
-#include "../constants.h"
+#include "constants.h"
 
 continuous_restoration::continuous_restoration(const position &pos):
         potion{potion_type::CONTINUOUS_RESTORATION, DURATION, pos} {}
diff --git a/src/potions/continuous_restoration.h b/src/continuous_restoration.h
similarity index 95%
rename from src/potions/continuous_restoration.h
rename to src/continuous_restoration.h
index 27b181b..20046ad 100644
--- a/src/potions/continuous_restoration.h
+++ b/src/continuous_restoration.h
@@ -1,7 +1,7 @@
 #ifndef __CONTINUOUS_RESTORATION_H__
 #define __CONTINUOUS_RESTORATION_H__
 
-#include "../potion.h"
+#include "potion.h"
 
 class continuous_restoration final: public potion {
         static const int GAIN_HEALTH = 3;
diff --git a/src/input/curses_input.cc b/src/curses_input.cc
similarity index 98%
rename from src/input/curses_input.cc
rename to src/curses_input.cc
index c608299..30fc9b8 100644
--- a/src/input/curses_input.cc
+++ b/src/curses_input.cc
@@ -1,6 +1,6 @@
 #include "curses_input.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 curses_input::curses_input(cursor *new_curse):
         curse{new_curse} {}
diff --git a/src/input/curses_input.h b/src/curses_input.h
similarity index 84%
rename from src/input/curses_input.h
rename to src/curses_input.h
index 9f6b978..7a4e489 100644
--- a/src/input/curses_input.h
+++ b/src/curses_input.h
@@ -2,8 +2,8 @@
 #define __CURSES_INPUT_H__
 
 #include <memory>
-#include "../input.h"
-#include "../cursor.h"
+#include "input.h"
+#include "cursor.h"
 
 class curses_input final: public input {
 private:
diff --git a/src/output/curses_output.cc b/src/curses_output.cc
similarity index 97%
rename from src/output/curses_output.cc
rename to src/curses_output.cc
index 4effa37..11dad62 100644
--- a/src/output/curses_output.cc
+++ b/src/curses_output.cc
@@ -1,6 +1,6 @@
 #include "curses_output.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 curses_output::curses_output(cursor *new_curse):
         curse{new_curse} {}
diff --git a/src/output/curses_output.h b/src/curses_output.h
similarity index 91%
rename from src/output/curses_output.h
rename to src/curses_output.h
index 7d841b9..3476c3f 100644
--- a/src/output/curses_output.h
+++ b/src/curses_output.h
@@ -3,8 +3,8 @@
 
 #include <utility>
 #include <memory>
-#include "../cursor.h"
-#include "../output.h"
+#include "cursor.h"
+#include "output.h"
 
 class curses_output final : public output {
 private:
diff --git a/src/design.pdf b/src/design.pdf
new file mode 100644
index 0000000..e9bdd4a
Binary files /dev/null and b/src/design.pdf differ
diff --git a/src/enemies/dragon.cc b/src/dragon.cc
similarity index 94%
rename from src/enemies/dragon.cc
rename to src/dragon.cc
index d721e83..d0129d5 100644
--- a/src/enemies/dragon.cc
+++ b/src/dragon.cc
@@ -1,7 +1,7 @@
 #include "dragon.h"
 
-#include "../constants.h"
-#include "../level.h"
+#include "constants.h"
+#include "level.h"
 
 dragon::dragon(RNG *rng, const feature enabled_features, const position &pos,
                const int gen_room_num, const position &guards):
diff --git a/src/enemies/dragon.h b/src/dragon.h
similarity index 95%
rename from src/enemies/dragon.h
rename to src/dragon.h
index c2d1359..7b7d8c5 100644
--- a/src/enemies/dragon.h
+++ b/src/dragon.h
@@ -1,7 +1,7 @@
 #ifndef __DRAGON_H__
 #define __DRAGON_H__
 
-#include "../enemy.h"
+#include "enemy.h"
 
 class dragon final: public enemy_base {
         const position guards;
diff --git a/src/player/drow.cc b/src/drow.cc
similarity index 88%
rename from src/player/drow.cc
rename to src/drow.cc
index 6135cf3..5c1a082 100644
--- a/src/player/drow.cc
+++ b/src/drow.cc
@@ -1,6 +1,6 @@
 #include "drow.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 drow::drow(RNG *rng, const feature enabled_features):
         player_base{rng, enabled_features, race::DROW} {}
diff --git a/src/player/drow.h b/src/drow.h
similarity index 89%
rename from src/player/drow.h
rename to src/drow.h
index 4e67295..112da0b 100644
--- a/src/player/drow.h
+++ b/src/drow.h
@@ -1,7 +1,7 @@
 #ifndef __DROW_H__
 #define __DROW_H__
 
-#include "../player.h"
+#include "player.h"
 
 class drow final: public player_base {
 public:
diff --git a/src/enemies/dwarf.cc b/src/dwarf.cc
similarity index 91%
rename from src/enemies/dwarf.cc
rename to src/dwarf.cc
index 7a8d798..6406e8e 100644
--- a/src/enemies/dwarf.cc
+++ b/src/dwarf.cc
@@ -1,6 +1,6 @@
 #include "dwarf.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 dwarf::dwarf(RNG *rng, const feature enabled_features, const position &pos,
              const int gen_room_num):
diff --git a/src/enemies/dwarf.h b/src/dwarf.h
similarity index 92%
rename from src/enemies/dwarf.h
rename to src/dwarf.h
index efe02c6..5fc3178 100644
--- a/src/enemies/dwarf.h
+++ b/src/dwarf.h
@@ -1,7 +1,7 @@
 #ifndef __DWARF_H__
 #define __DWARF_H__
 
-#include "../enemy.h"
+#include "enemy.h"
 
 class dwarf final: public enemy_base {
 public:
diff --git a/src/potions/echoing_resilience.cc b/src/echoing_resilience.cc
similarity index 97%
rename from src/potions/echoing_resilience.cc
rename to src/echoing_resilience.cc
index 35dc3da..0073823 100644
--- a/src/potions/echoing_resilience.cc
+++ b/src/echoing_resilience.cc
@@ -1,7 +1,7 @@
 #include "echoing_resilience.h"
 
 #include <algorithm>
-#include "../constants.h"
+#include "constants.h"
 
 echoing_resilience::echoing_resilience(const position &pos):
         potion{potion_type::ECHOING_RESIL, DURATION, pos} {}
diff --git a/src/potions/echoing_resilience.h b/src/echoing_resilience.h
similarity index 96%
rename from src/potions/echoing_resilience.h
rename to src/echoing_resilience.h
index a5a0a23..5340db6 100644
--- a/src/potions/echoing_resilience.h
+++ b/src/echoing_resilience.h
@@ -1,7 +1,7 @@
 #ifndef __ECHOING_RESILIENCE_H__
 #define __ECHOING_RESILIENCE_H__
 
-#include "../potion.h"
+#include "potion.h"
 
 class echoing_resilience final: public potion {
         static const int GAIN_HEALTH = 7;
diff --git a/src/enemies/elf.cc b/src/elf.cc
similarity index 96%
rename from src/enemies/elf.cc
rename to src/elf.cc
index 54d7a34..8647c5b 100644
--- a/src/enemies/elf.cc
+++ b/src/elf.cc
@@ -1,6 +1,6 @@
 #include "elf.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 elf::elf(RNG *rng, const feature enabled_features, const position &pos,
          const int gen_room_num):
diff --git a/src/enemies/elf.h b/src/elf.h
similarity index 93%
rename from src/enemies/elf.h
rename to src/elf.h
index d416a33..f828c4a 100644
--- a/src/enemies/elf.h
+++ b/src/elf.h
@@ -1,7 +1,7 @@
 #ifndef __ELF_H__
 #define __ELF_H__
 
-#include "../enemy.h"
+#include "enemy.h"
 
 class elf final: public enemy_base {
 public:
diff --git a/src/enemies.cc b/src/enemies.cc
index 3f6161a..cb9c059 100644
--- a/src/enemies.cc
+++ b/src/enemies.cc
@@ -1,19 +1,19 @@
 #include "enemies.h"
 
 #include "constants.h"
-#include "enemies/dragon.h"
-#include "enemies/dwarf.h"
-#include "enemies/elf.h"
-#include "enemies/halfling.h"
-#include "enemies/human.h"
-#include "enemies/merchant.h"
-#include "enemies/orc.h"
-#include "enemies/viking.h"
-#include "enemies/swordsman.h"
-#include "enemies/leprechaun.h"
-#include "enemies/witch.h"
-#include "enemies/hacker.h"
-#include "enemies/baby_dragon.h"
+#include "dragon.h"
+#include "dwarf.h"
+#include "elf.h"
+#include "halfling.h"
+#include "human.h"
+#include "merchant.h"
+#include "orc.h"
+#include "viking.h"
+#include "swordsman.h"
+#include "leprechaun.h"
+#include "witch.h"
+#include "hacker.h"
+#include "baby_dragon.h"
 
 std::unique_ptr<enemy_base> new_dragon(RNG *rng, const position &pos,
                                        const position &fallback,
diff --git a/src/input/file_input.cc b/src/file_input.cc
similarity index 98%
rename from src/input/file_input.cc
rename to src/file_input.cc
index 0da19b4..e0f2ffd 100644
--- a/src/input/file_input.cc
+++ b/src/file_input.cc
@@ -2,7 +2,7 @@
 
 #include <utility>
 #include <string>
-#include "../constants.h"
+#include "constants.h"
 
 file_input::file_input(std::ifstream &&ifs):
         in{std::move(ifs)} {}
diff --git a/src/input/file_input.h b/src/file_input.h
similarity index 92%
rename from src/input/file_input.h
rename to src/file_input.h
index 48fc9f5..afcb220 100644
--- a/src/input/file_input.h
+++ b/src/file_input.h
@@ -2,7 +2,7 @@
 #define __FILE_INPUT_H__
 
 #include <fstream>
-#include "../input.h"
+#include "input.h"
 
 class file_input final : public input {
 private:
diff --git a/src/output/file_output.cc b/src/file_output.cc
similarity index 97%
rename from src/output/file_output.cc
rename to src/file_output.cc
index 80c0e4b..b3d7f67 100644
--- a/src/output/file_output.cc
+++ b/src/file_output.cc
@@ -2,7 +2,7 @@
 
 #include <utility>
 
-#include "../constants.h"
+#include "constants.h"
 
 file_output::file_output(std::ofstream &&ofs):
         out{std::move(ofs)} {}
diff --git a/src/output/file_output.h b/src/file_output.h
similarity index 95%
rename from src/output/file_output.h
rename to src/file_output.h
index 5e0f80d..e69bced 100644
--- a/src/output/file_output.h
+++ b/src/file_output.h
@@ -2,7 +2,7 @@
 #define __FILE_OUTPUT_H__
 
 #include <fstream>
-#include "../output.h"
+#include "output.h"
 
 class file_output final : public output {
 private:
diff --git a/src/potions/fine_booze.cc b/src/fine_booze.cc
similarity index 97%
rename from src/potions/fine_booze.cc
rename to src/fine_booze.cc
index ecc9381..5fb4c66 100644
--- a/src/potions/fine_booze.cc
+++ b/src/fine_booze.cc
@@ -1,7 +1,7 @@
 #include "fine_booze.h"
 
 #include <algorithm>
-#include "../constants.h"
+#include "constants.h"
 
 fine_booze::fine_booze(const position &pos):
         potion{potion_type::FINE_BOOZE, DURATION, pos} {}
diff --git a/src/potions/fine_booze.h b/src/fine_booze.h
similarity index 91%
rename from src/potions/fine_booze.h
rename to src/fine_booze.h
index bde8eb8..1412217 100644
--- a/src/potions/fine_booze.h
+++ b/src/fine_booze.h
@@ -1,8 +1,8 @@
 #ifndef __FINE_BOOZE_H__
 #define __FINE_BOOZE_H__
 
-#include "../potion.h"
-#include "../constants.h"
+#include "potion.h"
+#include "constants.h"
 
 class fine_booze final: public potion {
         static const int GAIN_HP = 2;
diff --git a/src/game.cc b/src/game.cc
index ec29a7f..c606b4e 100644
--- a/src/game.cc
+++ b/src/game.cc
@@ -2,7 +2,7 @@
 
 #include "constants.h"
 #include "pc.h"
-#include "enemies/dragon.h"
+#include "dragon.h"
 
 game::game(const enum race starting_race,
            const feature enabled_features,
diff --git a/src/player/goblin.cc b/src/goblin.cc
similarity index 98%
rename from src/player/goblin.cc
rename to src/goblin.cc
index 8b6c983..88694b7 100644
--- a/src/player/goblin.cc
+++ b/src/goblin.cc
@@ -1,6 +1,6 @@
 #include "goblin.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 goblin::goblin(RNG *rng, const feature enabled_features):
         player_base{rng, enabled_features, race::GOBLIN} {};
diff --git a/src/player/goblin.h b/src/goblin.h
similarity index 95%
rename from src/player/goblin.h
rename to src/goblin.h
index 86c989a..211142a 100644
--- a/src/player/goblin.h
+++ b/src/goblin.h
@@ -1,7 +1,7 @@
 #ifndef __GOBLIN_H__
 #define __GOBLIN_H__
 
-#include "../player.h"
+#include "player.h"
 
 class goblin final: public player_base {
         static const int GAIN_GOLD = 5;
diff --git a/src/enemies/hacker.cc b/src/hacker.cc
similarity index 97%
rename from src/enemies/hacker.cc
rename to src/hacker.cc
index bb3fb25..5a978c4 100644
--- a/src/enemies/hacker.cc
+++ b/src/hacker.cc
@@ -1,6 +1,6 @@
 #include "hacker.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 hacker::hacker(RNG *rng, const feature enabled_features, const position &pos,
                const int gen_room_num):
diff --git a/src/enemies/hacker.h b/src/hacker.h
similarity index 96%
rename from src/enemies/hacker.h
rename to src/hacker.h
index 3ea590f..292c4b5 100644
--- a/src/enemies/hacker.h
+++ b/src/hacker.h
@@ -1,7 +1,7 @@
 #ifndef __HACKER_H__
 #define __HACKER_H__
 
-#include "../enemy.h"
+#include "enemy.h"
 
 class hacker final: public enemy_base {
         static const int RAND_STR_LEN_MIN = 10;
diff --git a/src/enemies/halfling.cc b/src/halfling.cc
similarity index 98%
rename from src/enemies/halfling.cc
rename to src/halfling.cc
index 3142870..40b843c 100644
--- a/src/enemies/halfling.cc
+++ b/src/halfling.cc
@@ -1,6 +1,6 @@
 #include "halfling.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 fraction halfling::HIT_RATE_MUL = {1, 2};
 
diff --git a/src/enemies/halfling.h b/src/halfling.h
similarity index 95%
rename from src/enemies/halfling.h
rename to src/halfling.h
index 6c8cd8f..71845c0 100644
--- a/src/enemies/halfling.h
+++ b/src/halfling.h
@@ -1,7 +1,7 @@
 #ifndef __HALFLING_H__
 #define __HALFLING_H__
 
-#include "../enemy.h"
+#include "enemy.h"
 
 class halfling final: public enemy_base {
         static fraction HIT_RATE_MUL;
diff --git a/src/enemies/human.cc b/src/human.cc
similarity index 92%
rename from src/enemies/human.cc
rename to src/human.cc
index edea824..749c4a6 100644
--- a/src/enemies/human.cc
+++ b/src/human.cc
@@ -1,7 +1,7 @@
 #include "human.h"
 
-#include "../constants.h"
-#include "../level.h"
+#include "constants.h"
+#include "level.h"
 
 human::human(RNG *rng, const feature enabled_features, const position &pos,
              const int gen_room_num):
diff --git a/src/enemies/human.h b/src/human.h
similarity index 93%
rename from src/enemies/human.h
rename to src/human.h
index b6179a9..f1a435b 100644
--- a/src/enemies/human.h
+++ b/src/human.h
@@ -1,7 +1,7 @@
 #ifndef __HUMAN_H__
 #define __HUMAN_H__
 
-#include "../enemy.h"
+#include "enemy.h"
 
 class human final: public enemy_base {
 public:
diff --git a/src/potions/ironclad_ward.cc b/src/ironclad_ward.cc
similarity index 96%
rename from src/potions/ironclad_ward.cc
rename to src/ironclad_ward.cc
index 6077c06..e8b5cfa 100644
--- a/src/potions/ironclad_ward.cc
+++ b/src/ironclad_ward.cc
@@ -1,7 +1,7 @@
 #include "ironclad_ward.h"
 
 #include <algorithm>
-#include "../constants.h"
+#include "constants.h"
 
 ironclad_ward::ironclad_ward(const position &pos):
         potion{potion_type::IRONCLAD_WARD, DURATION, pos} {}
diff --git a/src/potions/ironclad_ward.h b/src/ironclad_ward.h
similarity index 96%
rename from src/potions/ironclad_ward.h
rename to src/ironclad_ward.h
index 36dcc92..63c800f 100644
--- a/src/potions/ironclad_ward.h
+++ b/src/ironclad_ward.h
@@ -1,7 +1,7 @@
 #ifndef __IRONCLAD_WARD_H__
 #define __IRONCLAD_WARD_H__
 
-#include "../potion.h"
+#include "potion.h"
 
 class ironclad_ward final: public potion {
         inline static const float ATK_MUL = 0.5f;
diff --git a/src/enemies/leprechaun.cc b/src/leprechaun.cc
similarity index 94%
rename from src/enemies/leprechaun.cc
rename to src/leprechaun.cc
index 7ed979b..1b8c1ae 100644
--- a/src/enemies/leprechaun.cc
+++ b/src/leprechaun.cc
@@ -1,8 +1,8 @@
 #include "leprechaun.h"
 
-#include "../constants.h"
-#include "../player.h"
-#include "../level.h"
+#include "constants.h"
+#include "player.h"
+#include "level.h"
 
 leprechaun::leprechaun(RNG *rng, const feature enabled_features,
                        const position &pos,
diff --git a/src/enemies/leprechaun.h b/src/leprechaun.h
similarity index 96%
rename from src/enemies/leprechaun.h
rename to src/leprechaun.h
index 4a8fc38..1ac7cb5 100644
--- a/src/enemies/leprechaun.h
+++ b/src/leprechaun.h
@@ -1,7 +1,7 @@
 #ifndef __LEPRECHAUN_H__
 #define __LEPRECHAUN_H__
 
-#include "../enemy.h"
+#include "enemy.h"
 
 class leprechaun final: public enemy_base {
         static const int STEAL_GOLD = 3;
diff --git a/src/enemies/merchant.cc b/src/merchant.cc
similarity index 85%
rename from src/enemies/merchant.cc
rename to src/merchant.cc
index 5d24bc4..2bba344 100644
--- a/src/enemies/merchant.cc
+++ b/src/merchant.cc
@@ -1,8 +1,8 @@
 #include "merchant.h"
 
-#include "../constants.h"
-#include "../gold.h"
-#include "../level.h"
+#include "constants.h"
+#include "gold.h"
+#include "level.h"
 
 merchant::merchant(RNG *rng, const feature enabled_features,
                    const position &pos, const int gen_room_num):
diff --git a/src/enemies/merchant.h b/src/merchant.h
similarity index 93%
rename from src/enemies/merchant.h
rename to src/merchant.h
index b9dd030..ab113c8 100644
--- a/src/enemies/merchant.h
+++ b/src/merchant.h
@@ -1,7 +1,7 @@
 #ifndef __MERCHANT_H__
 #define __MERCHANT_H__
 
-#include "../enemy.h"
+#include "enemy.h"
 
 class merchant final: public enemy_base {
 public:
diff --git a/src/player/monk.cc b/src/monk.cc
similarity index 93%
rename from src/player/monk.cc
rename to src/monk.cc
index 4aae4fd..252e374 100644
--- a/src/player/monk.cc
+++ b/src/monk.cc
@@ -1,6 +1,6 @@
 #include "monk.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 monk::monk(RNG *rng, const feature enabled_features):
         player_base{rng, enabled_features, MONK} {}
diff --git a/src/player/monk.h b/src/monk.h
similarity index 92%
rename from src/player/monk.h
rename to src/monk.h
index c35b101..c55e315 100644
--- a/src/player/monk.h
+++ b/src/monk.h
@@ -1,7 +1,7 @@
 #ifndef __MONK_H__
 #define __MONK_H__
 
-#include "../player.h"
+#include "player.h"
 
 class monk final: public player_base {
         static const int GAIN_HP = 2;
diff --git a/src/player/mr_goose.cc b/src/mr_goose.cc
similarity index 92%
rename from src/player/mr_goose.cc
rename to src/mr_goose.cc
index 91f5896..d283555 100644
--- a/src/player/mr_goose.cc
+++ b/src/mr_goose.cc
@@ -1,6 +1,6 @@
 #include "mr_goose.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 mr_goose::mr_goose(RNG *rng, const feature enabled_features):
         player_base{rng, enabled_features, race::MR_GOOSE} {
diff --git a/src/player/mr_goose.h b/src/mr_goose.h
similarity index 90%
rename from src/player/mr_goose.h
rename to src/mr_goose.h
index 8fb6864..3f39d7b 100644
--- a/src/player/mr_goose.h
+++ b/src/mr_goose.h
@@ -1,7 +1,7 @@
 #ifndef __MR_GOOSE_H__
 #define __MR_GOOSE_H__
 
-#include "../player.h"
+#include "player.h"
 
 class mr_goose final: public player_base {
 public:
diff --git a/src/enemies/orc.cc b/src/orc.cc
similarity index 91%
rename from src/enemies/orc.cc
rename to src/orc.cc
index ca0b8be..0857404 100644
--- a/src/enemies/orc.cc
+++ b/src/orc.cc
@@ -1,6 +1,6 @@
 #include "orc.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 orc::orc(RNG *rng, const feature enabled_features, const position &pos,
          const int gen_room_num):
diff --git a/src/enemies/orc.h b/src/orc.h
similarity index 92%
rename from src/enemies/orc.h
rename to src/orc.h
index f11913d..8a20e55 100644
--- a/src/enemies/orc.h
+++ b/src/orc.h
@@ -1,7 +1,7 @@
 #ifndef __ORC_H__
 #define __ORC_H__
 
-#include "../enemy.h"
+#include "enemy.h"
 
 class orc final: public enemy_base {
 public:
diff --git a/src/pc.cc b/src/pc.cc
index 6c46153..9af036c 100644
--- a/src/pc.cc
+++ b/src/pc.cc
@@ -1,16 +1,16 @@
 #include "pc.h"
 
 #include "constants.h"
-#include "player/goblin.h"
-#include "player/drow.h"
-#include "player/shade.h"
-#include "player/troll.h"
-#include "player/vampire.h"
-#include "player/t_800.h"
-#include "player/assassin.h"
-#include "player/monk.h"
-#include "player/brawler.h"
-#include "player/mr_goose.h"
+#include "goblin.h"
+#include "drow.h"
+#include "shade.h"
+#include "troll.h"
+#include "vampire.h"
+#include "t_800.h"
+#include "assassin.h"
+#include "monk.h"
+#include "brawler.h"
+#include "mr_goose.h"
 
 std::unique_ptr<player_base> init_player(RNG *rng,
                 const feature enabled_features, const enum race &r) {
diff --git a/src/potions/poison_health.cc b/src/poison_health.cc
similarity index 96%
rename from src/potions/poison_health.cc
rename to src/poison_health.cc
index 42a3c40..e4847f7 100644
--- a/src/potions/poison_health.cc
+++ b/src/poison_health.cc
@@ -1,7 +1,7 @@
 #include "poison_health.h"
 
 #include <algorithm>
-#include "../constants.h"
+#include "constants.h"
 
 poison_health::poison_health(const position &pos):
         potion{potion_type::POISON_HEALTH, 1, pos} {}
diff --git a/src/potions/poison_health.h b/src/poison_health.h
similarity index 94%
rename from src/potions/poison_health.h
rename to src/poison_health.h
index 89ea3e8..f281663 100644
--- a/src/potions/poison_health.h
+++ b/src/poison_health.h
@@ -1,7 +1,7 @@
 #ifndef __POISON_HEALTH_H__
 #define __POISON_HEALTH_H__
 
-#include "../potion.h"
+#include "potion.h"
 
 class poison_health final: public potion {
         static const int LOSE_HEALTH = 10;
diff --git a/src/potions.cc b/src/potions.cc
index 6235ebf..4a6b697 100644
--- a/src/potions.cc
+++ b/src/potions.cc
@@ -1,20 +1,20 @@
 #include "potions.h"
 
 #include "constants.h"
-#include "potions/restore_health.h"
-#include "potions/boost_atk.h"
-#include "potions/boost_def.h"
-#include "potions/poison_health.h"
-#include "potions/wound_atk.h"
-#include "potions/wound_def.h"
-#include "potions/continuous_restoration.h"
-#include "potions/savage_strike.h"
-#include "potions/echoing_resilience.h"
-#include "potions/tempest_tantrum.h"
-#include "potions/berzerk_brew.h"
-#include "potions/borrow_life.h"
-#include "potions/fine_booze.h"
-#include "potions/ironclad_ward.h"
+#include "restore_health.h"
+#include "boost_atk.h"
+#include "boost_def.h"
+#include "poison_health.h"
+#include "wound_atk.h"
+#include "wound_def.h"
+#include "continuous_restoration.h"
+#include "savage_strike.h"
+#include "echoing_resilience.h"
+#include "tempest_tantrum.h"
+#include "berzerk_brew.h"
+#include "borrow_life.h"
+#include "fine_booze.h"
+#include "ironclad_ward.h"
 
 std::unique_ptr<potion> new_potion(potion_type type, const position &pos) {
         switch (type) {
diff --git a/src/potions/restore_health.cc b/src/restore_health.cc
similarity index 97%
rename from src/potions/restore_health.cc
rename to src/restore_health.cc
index 5124f9d..3b9a7ed 100644
--- a/src/potions/restore_health.cc
+++ b/src/restore_health.cc
@@ -1,7 +1,7 @@
 #include "restore_health.h"
 
 #include <algorithm>
-#include "../constants.h"
+#include "constants.h"
 
 restore_health::restore_health(const position &pos):
         potion{potion_type::RESTORE_HEALTH, 1, pos} {}
diff --git a/src/potions/restore_health.h b/src/restore_health.h
similarity index 94%
rename from src/potions/restore_health.h
rename to src/restore_health.h
index 84d8bfd..f21ea8a 100644
--- a/src/potions/restore_health.h
+++ b/src/restore_health.h
@@ -1,7 +1,7 @@
 #ifndef __RESTORE_HEALTH_H__
 #define __RESTORE_HEALTH_H__
 
-#include "../potion.h"
+#include "potion.h"
 
 class restore_health final: public potion {
         static const int GAIN_HEALTH = 10;
diff --git a/src/result.cc b/src/result.cc
index ffce8d6..8de18d3 100644
--- a/src/result.cc
+++ b/src/result.cc
@@ -88,7 +88,7 @@ const char *LOSE_SCREEN =
 |                          | |   \\. _|_. | .  ||                              |\
 |                          |                  ||                              |\
 |                  *       | *   **    * **   |**      **                     |\
-|                   \\))...../.,(//,,..,,\\||(,,.,\\\\,.((//                      |\
+|                   \\))....,(//,,..,,\\||(,,.,\\\\,.((//                      |\
 |                                                                             |\
 |                                 Loser!                                      |\
 |                                                                             |\
diff --git a/src/potions/savage_strike.cc b/src/savage_strike.cc
similarity index 96%
rename from src/potions/savage_strike.cc
rename to src/savage_strike.cc
index a7bbdd3..36e9739 100644
--- a/src/potions/savage_strike.cc
+++ b/src/savage_strike.cc
@@ -1,7 +1,7 @@
 #include "savage_strike.h"
 
 #include <algorithm>
-#include "../constants.h"
+#include "constants.h"
 
 savage_strike::savage_strike(const position &pos):
         potion{potion_type::SAVAGE_STRIKE, DURATION, pos} {}
diff --git a/src/potions/savage_strike.h b/src/savage_strike.h
similarity index 95%
rename from src/potions/savage_strike.h
rename to src/savage_strike.h
index 5c01163..fd3f1d9 100644
--- a/src/potions/savage_strike.h
+++ b/src/savage_strike.h
@@ -1,7 +1,7 @@
 #ifndef __SAVAGE_STRIKE_H__
 #define __SAVAGE_STRIKE_H__
 
-#include "../potion.h"
+#include "potion.h"
 
 class savage_strike final: public potion {
         inline static const float ATK_MUL = 1.25f;
diff --git a/src/player/shade.cc b/src/shade.cc
similarity index 88%
rename from src/player/shade.cc
rename to src/shade.cc
index 02c6ce5..d283bb5 100644
--- a/src/player/shade.cc
+++ b/src/shade.cc
@@ -1,6 +1,6 @@
 #include "shade.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 shade::shade(RNG *rng, const feature enabled_features):
         player_base{rng, enabled_features, race::SHADE} {}
diff --git a/src/player/shade.h b/src/shade.h
similarity index 90%
rename from src/player/shade.h
rename to src/shade.h
index 7f05edc..dd7d154 100644
--- a/src/player/shade.h
+++ b/src/shade.h
@@ -1,7 +1,7 @@
 #ifndef __SHADE_H__
 #define __SHADE_H__
 
-#include "../player.h"
+#include "player.h"
 
 class shade final: public player_base {
 public:
diff --git a/src/enemies/swordsman.cc b/src/swordsman.cc
similarity index 92%
rename from src/enemies/swordsman.cc
rename to src/swordsman.cc
index fd7ddb6..8a3204d 100644
--- a/src/enemies/swordsman.cc
+++ b/src/swordsman.cc
@@ -1,6 +1,6 @@
 #include "swordsman.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 swordsman::swordsman(RNG *rng, const feature enabled_features,
                      const position &pos,
diff --git a/src/enemies/swordsman.h b/src/swordsman.h
similarity index 92%
rename from src/enemies/swordsman.h
rename to src/swordsman.h
index 08578e7..0935d1e 100644
--- a/src/enemies/swordsman.h
+++ b/src/swordsman.h
@@ -1,7 +1,7 @@
 #ifndef __SWORDSMAN_H__
 #define __SWORDSMAN_H__
 
-#include "../enemy.h"
+#include "enemy.h"
 
 class swordsman final: public enemy_base {
 public:
diff --git a/src/player/t_800.cc b/src/t_800.cc
similarity index 92%
rename from src/player/t_800.cc
rename to src/t_800.cc
index 99b05fe..051fa74 100644
--- a/src/player/t_800.cc
+++ b/src/t_800.cc
@@ -1,6 +1,6 @@
 #include "t_800.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 t_800::t_800(RNG *rng, const feature enabled_features):
         player_base{rng, enabled_features, race::RT_800} {}
diff --git a/src/player/t_800.h b/src/t_800.h
similarity index 93%
rename from src/player/t_800.h
rename to src/t_800.h
index e5c41b5..f98705e 100644
--- a/src/player/t_800.h
+++ b/src/t_800.h
@@ -1,7 +1,7 @@
 #ifndef __T_800_H__
 #define __T_800_H__
 
-#include "../player.h"
+#include "player.h"
 class potion;
 
 class t_800 final: public player_base {
diff --git a/src/potions/tempest_tantrum.cc b/src/tempest_tantrum.cc
similarity index 96%
rename from src/potions/tempest_tantrum.cc
rename to src/tempest_tantrum.cc
index f7911cc..5ba6c61 100644
--- a/src/potions/tempest_tantrum.cc
+++ b/src/tempest_tantrum.cc
@@ -1,7 +1,7 @@
 #include "tempest_tantrum.h"
 
 #include <algorithm>
-#include "../constants.h"
+#include "constants.h"
 
 tempest_tantrum::tempest_tantrum(const position &pos):
         potion{potion_type::TEMPEST_TANTRUM, DURATION, pos} {}
diff --git a/src/potions/tempest_tantrum.h b/src/tempest_tantrum.h
similarity index 96%
rename from src/potions/tempest_tantrum.h
rename to src/tempest_tantrum.h
index 31a5a88..63a5216 100644
--- a/src/potions/tempest_tantrum.h
+++ b/src/tempest_tantrum.h
@@ -1,7 +1,7 @@
 #ifndef __TEMPEST_TANTRUM_H__
 #define __TEMPEST_TANTRUM_H__
 
-#include "../potion.h"
+#include "potion.h"
 
 class tempest_tantrum final: public potion {
         static const int ATK_MUL = 3;
diff --git a/src/player/troll.cc b/src/troll.cc
similarity index 93%
rename from src/player/troll.cc
rename to src/troll.cc
index a60a37a..bede14c 100644
--- a/src/player/troll.cc
+++ b/src/troll.cc
@@ -1,6 +1,6 @@
 #include "troll.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 troll::troll(RNG *rng, const feature enabled_features):
         player_base{rng, enabled_features, TROLL} {}
diff --git a/src/player/troll.h b/src/troll.h
similarity index 92%
rename from src/player/troll.h
rename to src/troll.h
index 2f60257..a6edc7b 100644
--- a/src/player/troll.h
+++ b/src/troll.h
@@ -1,7 +1,7 @@
 #ifndef __TROLL_H__
 #define __TROLL_H__
 
-#include "../player.h"
+#include "player.h"
 
 class troll final: public player_base {
         static const int GAIN_HP = 5;
diff --git a/src/typescript b/src/typescript
deleted file mode 100644
index e69de29..0000000
diff --git a/src/uml-final.pdf b/src/uml-final.pdf
new file mode 100644
index 0000000..3922182
Binary files /dev/null and b/src/uml-final.pdf differ
diff --git a/src/player/vampire.cc b/src/vampire.cc
similarity index 97%
rename from src/player/vampire.cc
rename to src/vampire.cc
index 71c628a..afdc97a 100644
--- a/src/player/vampire.cc
+++ b/src/vampire.cc
@@ -1,6 +1,6 @@
 #include "vampire.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 vampire::vampire(RNG *rng, const feature enabled_features):
         player_base{rng, enabled_features, race::VAMPIRE} {};
diff --git a/src/player/vampire.h b/src/vampire.h
similarity index 93%
rename from src/player/vampire.h
rename to src/vampire.h
index 7a9ac87..c0406c4 100644
--- a/src/player/vampire.h
+++ b/src/vampire.h
@@ -1,7 +1,7 @@
 #ifndef __VAMPIRE_H__
 #define __VAMPIRE_H__
 
-#include "../player.h"
+#include "player.h"
 
 class vampire final: public player_base {
         static const int GAIN_HP = 5;
diff --git a/src/enemies/viking.cc b/src/viking.cc
similarity index 96%
rename from src/enemies/viking.cc
rename to src/viking.cc
index 9b3f56d..f47719d 100644
--- a/src/enemies/viking.cc
+++ b/src/viking.cc
@@ -1,6 +1,6 @@
 #include "viking.h"
 
-#include "../constants.h"
+#include "constants.h"
 
 viking::viking(RNG *rng, const feature enabled_features, const position &pos,
                const int gen_room_num):
diff --git a/src/enemies/viking.h b/src/viking.h
similarity index 93%
rename from src/enemies/viking.h
rename to src/viking.h
index 0fb19af..e40af8c 100644
--- a/src/enemies/viking.h
+++ b/src/viking.h
@@ -1,7 +1,7 @@
 #ifndef __VIKING_H__
 #define __VIKING_H__
 
-#include "../enemy.h"
+#include "enemy.h"
 
 class viking final: public enemy_base {
 public:
diff --git a/src/win1721585169.txt b/src/win1721585169.txt
deleted file mode 100644
index 3d467c5..0000000
--- a/src/win1721585169.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-t ea ea se se se ne ea ea ea ea ea ea ea no no no no 
-ea ea ea ea ea ea ea  ea ea ea ea ea
-no no no so so no no 
-a no a no a no a no a no a no a no a no 
-so so so no no no no ea ea ea ea
-no no a se a se a se a se a se a se a se ea so
-so so so so ea u ne ea ea ea ea ea u ea
-ea ea ne
-a so a so a so a so a so a so a so a so a so a so a so a so a so a so a so a so
-se ea ea ea ea ea ea ea ea ea ea ea ea ea ea ea ea ea ea ea ea ea se ea ea ea ea u ea
-ne ne sw ea ea ea ea ea ea ea ea ea ea ea ea ea ea ea
-u sw we we we we we we we so we we we we we
-a we a we we we we we we
-a we a we a we a we a we a we a we a we a we ne
-we we we we we we we we we we we we we we we we we we
-no no no no no no we we we we we we we we we we we we we we we we
-so so so
-no no 
-we u we
-ea so we we we we we we
-no no no no no
-ea ea ea ea ea ea ea ea ea ea ea ea ea ea ea ea ea ea
-no no no 
-so ea ea u ea ea a ea a ea a ea a ea a ea a ea a ea a ea a ea
-so ea no 
-ea ea ea ea ea ea ea ea ea ea ea ea ea ea ea ea ea ea ea ea ea
-no no no no
-ea ea ea ea ea ea ea ea ea ea ea ea
-no no no
-no so so no no we we
diff --git a/src/enemies/witch.cc b/src/witch.cc
similarity index 95%
rename from src/enemies/witch.cc
rename to src/witch.cc
index b0cee36..f249034 100644
--- a/src/enemies/witch.cc
+++ b/src/witch.cc
@@ -1,7 +1,7 @@
 #include "witch.h"
 
-#include "../constants.h"
-#include "../player.h"
+#include "constants.h"
+#include "player.h"
 
 witch::witch(RNG *rng, const feature enabled_features, const position &pos,
              const int gen_room_num):
diff --git a/src/enemies/witch.h b/src/witch.h
similarity index 94%
rename from src/enemies/witch.h
rename to src/witch.h
index 2e8081b..878879f 100644
--- a/src/enemies/witch.h
+++ b/src/witch.h
@@ -1,7 +1,7 @@
 #ifndef __WITCH_H__
 #define __WITCH_H__
 
-#include "../enemy.h"
+#include "enemy.h"
 
 class witch final: public enemy_base {
         inline static const fraction POTION_RATE = {1, 5};
diff --git a/src/potions/wound_atk.cc b/src/wound_atk.cc
similarity index 96%
rename from src/potions/wound_atk.cc
rename to src/wound_atk.cc
index 9597c34..c8caa70 100644
--- a/src/potions/wound_atk.cc
+++ b/src/wound_atk.cc
@@ -1,7 +1,7 @@
 #include "wound_atk.h"
 
 #include <algorithm>
-#include "../constants.h"
+#include "constants.h"
 
 wound_atk::wound_atk(const position &pos):
         potion{potion_type::WOUND_ATK, -1, pos} {}
diff --git a/src/potions/wound_atk.h b/src/wound_atk.h
similarity index 94%
rename from src/potions/wound_atk.h
rename to src/wound_atk.h
index 8b25c98..051770e 100644
--- a/src/potions/wound_atk.h
+++ b/src/wound_atk.h
@@ -1,7 +1,7 @@
 #ifndef __WOUND_ATK_H__
 #define __WOUND_ATK_H__
 
-#include "../potion.h"
+#include "potion.h"
 
 class wound_atk final: public potion {
         static const int WOUND_ATK = 5;
diff --git a/src/potions/wound_def.cc b/src/wound_def.cc
similarity index 96%
rename from src/potions/wound_def.cc
rename to src/wound_def.cc
index 3b28388..97ebf85 100644
--- a/src/potions/wound_def.cc
+++ b/src/wound_def.cc
@@ -1,7 +1,7 @@
 #include "wound_def.h"
 
 #include <algorithm>
-#include "../constants.h"
+#include "constants.h"
 
 wound_def::wound_def(const position &pos):
         potion{potion_type::WOUND_DEF, -1, pos} {}
diff --git a/src/potions/wound_def.h b/src/wound_def.h
similarity index 94%
rename from src/potions/wound_def.h
rename to src/wound_def.h
index 12ecded..f53a668 100644
--- a/src/potions/wound_def.h
+++ b/src/wound_def.h
@@ -1,7 +1,7 @@
 #ifndef __WOUND_DEF_H__
 #define __WOUND_DEF_H__
 
-#include "../potion.h"
+#include "potion.h"
 
 class wound_def final: public potion {
         static const int WOUND_DEF = 5;