Some more hierarchy cleanups.

data/game.cfg

@@ -58,11 +58,11 @@
 	sidebar_image="misc/rightside.png"
 	sidebar_image_bottom="misc/rightside-bottom.png"
 
-	moved_energy_image="moved-energy.png"
-	unmoved_energy_image="unmoved-energy.png"
-	partmoved_energy_image="partmoved-energy.png"
-	enemy_energy_image="enemy-energy.png"
-	ally_energy_image="ally-energy.png"
+	moved_energy_image="misc/bar-energy-moved.png"
+	unmoved_energy_image="misc/bar-energy-unmoved.png"
+	partmoved_energy_image="misc/bar-energy-partmoved.png"
+	enemy_energy_image="misc/bar-energy-enemy.png"
+	ally_energy_image="misc/bar-energy-ally.png"
 	flag_image="terrain/flag-team%d-1.png:150,terrain/flag-team%d-2.png:150"
 
 	cross_image="misc/cross.png"

src/display.cpp

@@ -1234,7 +1234,7 @@ void display::draw_unit_on_tile(int x, int y, surface unit_image_override,
 		const bool near_advance = u.max_experience() - u.experience() <= game_config::kill_experience*level;
 		const SDL_Color colour = near_advance ? near_advance_colour : normal_colour;
 
-		draw_bar("enemy-energy.png",xpos+5,ypos,u.max_experience()/(level*2),filled,colour,bar_alpha);
+		draw_bar("misc/bar-energy-enemy.png",xpos+5,ypos,u.max_experience()/(level*2),filled,colour,bar_alpha);
 	}
 
 	const std::vector<std::string>& overlays = it->second.overlays();
@@ -1251,7 +1251,7 @@ void display::draw_bar(const std::string& image, int xpos, int ypos, size_t heig
 	filled = minimum<double>(maximum<double>(filled,0.0),1.0);
 
 	surface surf(image::get_image(image,image::SCALED,image::NO_ADJUST_COLOUR));
-	surface unmoved_surf(image::get_image("unmoved-energy.png",image::SCALED,image::NO_ADJUST_COLOUR));
+	surface unmoved_surf(image::get_image("misc/bar-energy-unmoved.png",image::SCALED,image::NO_ADJUST_COLOUR));
 	if(surf == NULL || unmoved_surf == NULL) {
 		return;
 	}

src/game_config.cpp

@@ -42,11 +42,11 @@ namespace game_config
 	std::string rightside_image = "misc/rightside.png";
 	std::string rightside_image_bot = "misc/rightside-bottom.png";
 
-	std::string moved_energy_image = "moved-energy.png";
-	std::string unmoved_energy_image = "unmoved-energy.png";
-	std::string partmoved_energy_image = "partmoved-energy.png";
-	std::string enemy_energy_image = "enemy-energy.png";
-	std::string ally_energy_image = "ally-energy.png";
+	std::string moved_energy_image = "misc/bar-energy-moved.png";
+	std::string unmoved_energy_image = "misc/bar-energy-unmoved.png";
+	std::string partmoved_energy_image = "misc/bar-energy-partmoved.png";
+	std::string enemy_energy_image = "misc/bar-energy-enemy.png";
+	std::string ally_energy_image = "misc/bar-energy-ally.png";
 	std::string flag_image = "terrain/flag-team%d-1.png:150,terrain/flag-team%d-2.png:150";
 
 	std::string dot_image = "misc/dot.png";