diff --git a/turtlebot3_gazebo/launch/turtlebot3_empty_world.launch b/turtlebot3_gazebo/launch/turtlebot3_empty_world.launch
index dbe1c05..b4cd188 100644
--- a/turtlebot3_gazebo/launch/turtlebot3_empty_world.launch
+++ b/turtlebot3_gazebo/launch/turtlebot3_empty_world.launch
@@ -5,7 +5,7 @@
   <arg name="z_pos" default="0.0"/>
 
   <include file="$(find gazebo_ros)/launch/empty_world.launch">
-    <arg name="world_name" value="$(find turtlebot3_gazebo)/worlds/empty.world"/>
+    <arg name="world_name" value="$(find turtlebot3_gazebo)/models/empty.world"/>
     <arg name="paused" value="false"/>
     <arg name="use_sim_time" value="true"/>
     <arg name="gui" value="true"/>
diff --git a/turtlebot3_gazebo/launch/turtlebot3_world.launch b/turtlebot3_gazebo/launch/turtlebot3_world.launch
index ece4cdc..7b470de 100644
--- a/turtlebot3_gazebo/launch/turtlebot3_world.launch
+++ b/turtlebot3_gazebo/launch/turtlebot3_world.launch
@@ -5,7 +5,7 @@
   <arg name="z_pos" default="0.0"/>
 
   <include file="$(find gazebo_ros)/launch/empty_world.launch">
-    <arg name="world_name" value="$(find turtlebot3_gazebo)/worlds/turtlebot3.world"/>
+    <arg name="world_name" value="$(find turtlebot3_gazebo)/models/turtlebot3.world"/>
     <arg name="paused" value="false"/>
     <arg name="use_sim_time" value="true"/>
     <arg name="gui" value="true"/>
diff --git a/turtlebot3_gazebo/worlds/empty.world b/turtlebot3_gazebo/models/empty.world
similarity index 100%
rename from turtlebot3_gazebo/worlds/empty.world
rename to turtlebot3_gazebo/models/empty.world
diff --git a/turtlebot3_gazebo/worlds/turtlebot3.world b/turtlebot3_gazebo/models/turtlebot3.world
similarity index 100%
rename from turtlebot3_gazebo/worlds/turtlebot3.world
rename to turtlebot3_gazebo/models/turtlebot3.world
diff --git a/turtlebot3_gazebo/worlds/turtlebot3/meshes/hexagon.dae b/turtlebot3_gazebo/models/turtlebot3/meshes/hexagon.dae
similarity index 100%
rename from turtlebot3_gazebo/worlds/turtlebot3/meshes/hexagon.dae
rename to turtlebot3_gazebo/models/turtlebot3/meshes/hexagon.dae
diff --git a/turtlebot3_gazebo/worlds/turtlebot3/meshes/wall.dae b/turtlebot3_gazebo/models/turtlebot3/meshes/wall.dae
similarity index 100%
rename from turtlebot3_gazebo/worlds/turtlebot3/meshes/wall.dae
rename to turtlebot3_gazebo/models/turtlebot3/meshes/wall.dae
diff --git a/turtlebot3_gazebo/worlds/turtlebot3/model.config b/turtlebot3_gazebo/models/turtlebot3/model.config
similarity index 100%
rename from turtlebot3_gazebo/worlds/turtlebot3/model.config
rename to turtlebot3_gazebo/models/turtlebot3/model.config
diff --git a/turtlebot3_gazebo/worlds/turtlebot3/model.sdf b/turtlebot3_gazebo/models/turtlebot3/model.sdf
similarity index 100%
rename from turtlebot3_gazebo/worlds/turtlebot3/model.sdf
rename to turtlebot3_gazebo/models/turtlebot3/model.sdf
diff --git a/turtlebot3_gazebo/package.xml b/turtlebot3_gazebo/package.xml
index 450d8ad..4d7a121 100644
--- a/turtlebot3_gazebo/package.xml
+++ b/turtlebot3_gazebo/package.xml
@@ -28,4 +28,7 @@
   <run_depend>geometry_msgs</run_depend>
   <run_depend>tf</run_depend>
   <run_depend>gazebo_ros</run_depend>
+  <export>
+    <gazebo_ros plugin_path="${prefix}/lib" gazebo_media_path="${prefix}" gazebo_model_path="${prefix}/models"/>
+  </export>
 </package>