diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71d89b8ffcd4d0ef6ad9fb7bb7bc49cd9c0d543f..0f1b8c32a22ff2b6b666e3f302f81fc500ff26cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,21 +30,20 @@ find_package(catkin REQUIRED
 # System dependencies are found with CMake's conventions
 find_package(Boost REQUIRED COMPONENTS filesystem)
 
-find_package(PkgConfig REQUIRED)
-
 # ################################################################################################################################
 # catkin specific configuration ##
 # ################################################################################################################################
 # The catkin_package macro generates cmake config files for your package Declare things to be passed to dependent projects
-catkin_package(CATKIN_DEPENDS
+catkin_package(
+        CATKIN_DEPENDS
                moveit_core
                moveit_visual_tools
                moveit_ros_planning_interface
                controller_interface
                hardware_interface
                pluginlib
-#               DEPENDS
-#               system_lib
+#       DEPENDS
+#              system_lib
         )
 
 # ################################################################################################################################
@@ -52,15 +51,82 @@ catkin_package(CATKIN_DEPENDS
 # ################################################################################################################################
 
 # Specify additional locations of header files Your package locations should be listed before other locations
-include_directories(${catkin_INCLUDE_DIRS} ${SDF_INCLUDE_DIRS})
+include_directories(${catkin_INCLUDE_DIRS})
+
+## Declare C++ executables
+add_executable(${PROJECT_NAME}_robot_state_initializer_node src/robot_state_initializer.cpp)
 
-# add custom controller as library
+## Declare C++ libraries
 add_library(${PROJECT_NAME}_controllers_lib src/joint_position_controller.cpp)
 
+
+## Add cmake target dependencies of the library
+## as an example, code may need to be generated before libraries
+## either from message generation or dynamic reconfigure
+
+
+## Rename C++ executable without prefix
+## The above recommended prefix causes long target names, the following renames the
+## target back to the shorter version for ease of user use
+## e.g. "rosrun someones_pkg node" instead of "rosrun someones_pkg someones_pkg_node"
+set_target_properties(${PROJECT_NAME}_robot_state_initializer_node PROPERTIES OUTPUT_NAME robot_state_initializer_node PREFIX "")
+
+
 # Specify libraries to link a library or executable target against
 target_link_libraries(${PROJECT_NAME}_controllers_lib ${catkin_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}_robot_state_initializer_node ${catkin_LIBRARIES})
+
+#############
+## Install ##
+#############
+
+# all install targets should use catkin DESTINATION variables
+# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html
+
+## Mark executable scripts (Python etc.) for installation
+## in contrast to setup.py, you can choose the destination
+# catkin_install_python(PROGRAMS
+#   scripts/my_python_script
+#   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+# )
+
+## Mark executables for installation
+## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_executables.html
+# install(TARGETS ${PROJECT_NAME}_node
+#   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+# )
+
+## Mark libraries for installation
+## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_libraries.html
+# install(TARGETS ${PROJECT_NAME}
+#   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+#   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+#   RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
+# )
+
+## Mark cpp header files for installation
+# install(DIRECTORY include/${PROJECT_NAME}/
+#   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
+#   FILES_MATCHING PATTERN "*.h"
+#   PATTERN ".svn" EXCLUDE
+# )
+
+## Mark other files for installation (e.g. launch and bag files, etc.)
+# install(FILES
+#   # myfile1
+#   # myfile2
+#   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
+# )
 
-add_executable(robot_state_initializer_node src/robot_state_initializer.cpp)
+#############
+## Testing ##
+#############
 
-target_link_libraries(robot_state_initializer_node ${catkin_LIBRARIES})
+## Add gtest based cpp test target and link libraries
+# catkin_add_gtest(${PROJECT_NAME}-test test/test_gazebo_zones.cpp)
+# if(TARGET ${PROJECT_NAME}-test)
+#   target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
+# endif()
 
+## Add folders to be run by python nosetests
+# catkin_add_nosetests(test)
diff --git a/package.xml b/package.xml
index 70e78ae73207a2db3e74719bef533d47e0352e7a..0ffcc3c252aa6c25958af41f7e89e5f3f6d1f4f1 100644
--- a/package.xml
+++ b/package.xml
@@ -1,19 +1,33 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>panda_simulation</name>
-  <version>0.0.0</version>
+  <version>0.2.0</version>
   <description>The panda_simulation package</description>
 
   <!-- One maintainer tag required, multiple allowed, one person per tag -->
   <!-- Example:  -->
   <!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
-  <maintainer email="st@todo.todo">ST-Chair</maintainer>
+  <maintainer email="johannes.mey@tu-dresden.de">Johannes Mey</maintainer>
+  <maintainer email="sebastian.ebert@tu-dresden.de">Sebastian Ebert</maintainer>
 
+  <!-- Url tags are optional, but multiple are allowed, one per tag -->
+  <!-- Optional attribute type can be: website, bugtracker, or repository -->
+  <!-- Example: -->
+  <url type="website">http://wiki.ros.org/gazebo_zones</url>
+
+
+  <!-- Author tags are optional, multiple are allowed, one per tag -->
+  <!-- Authors do not have to be maintainers, but could be -->
+  <!-- Example: -->
+  <!-- <author email="jane.doe@example.com">Jane Doe</author> -->
+  <author email="johannes.mey@tu-dresden.de">Johannes Mey</author>
+  <author email="sebastian.ebert@tu-dresden.de">Sebastian Ebert</author>
+  <author>Erdal Pekel</author>
 
   <!-- One license tag required, multiple allowed, one license per tag -->
   <!-- Commonly used license strings: -->
   <!--   BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 -->
-  <license>TODO</license>
+  <license>MIT</license>
 
 
   <buildtool_depend>catkin</buildtool_depend>
@@ -41,6 +55,10 @@
   <depend>controller_interface</depend>
   <depend>hardware_interface</depend>
 
+
+  <build_depend>sdformat</build_depend>
+  <exec_depend>sdformat</exec_depend>
+
   <exec_depend>gazebo_ros</exec_depend>
 
   <exec_depend>pluginlib</exec_depend>