diff --git a/homer_msgs/CHANGELOG.rst b/CHANGELOG.rst
similarity index 100%
rename from homer_msgs/CHANGELOG.rst
rename to CHANGELOG.rst
diff --git a/homer_msgs/CMakeLists.txt b/CMakeLists.txt
similarity index 100%
rename from homer_msgs/CMakeLists.txt
rename to CMakeLists.txt
diff --git a/README.md b/README.md
index fec9940dd6ed2d9e198e57453719385abb016972..9a183aa44bd20292f542a4b80b1da913281881c0 100644
--- a/README.md
+++ b/README.md
@@ -1,171 +1,4 @@
-## homer_msgs (kinetic) - 0.1.5-1
-
-The packages in the `homer_msgs` repository were released into the `kinetic` distro by running `/usr/bin/bloom-release --rosdistro kinetic --track kinetic homer_msgs` on `Thu, 26 Jan 2017 14:48:52 -0000`
-
-These packages were released:
-- `homer_msgs`
-- `homer_ptu_msgs`
-
-Version of package(s) in repository `homer_msgs`:
-
-- upstream repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
-- release repository: unknown
-- rosdistro version: `null`
-- old version: `0.1.5-0`
-- new version: `0.1.5-1`
-
-Versions of tools used:
-
-- bloom version: `0.5.23`
-- catkin_pkg version: `0.2.10`
-- rosdep version: `0.11.5`
-- rosdistro version: `0.5.0`
-- vcstools version: `0.1.39`
-
-
-## homer_msgs (kinetic) - 0.1.5-0
-
-The packages in the `homer_msgs` repository were released into the `kinetic` distro by running `/usr/bin/bloom-release --rosdistro kinetic --track kinetic homer_msgs` on `Tue, 10 Jan 2017 17:20:07 -0000`
-
-These packages were released:
-- `homer_msgs`
-- `homer_ptu_msgs`
-
-Version of package(s) in repository `homer_msgs`:
-
-- upstream repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
-- release repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
-- rosdistro version: `0.1.4-0`
-- old version: `0.1.4-0`
-- new version: `0.1.5-0`
-
-Versions of tools used:
-
-- bloom version: `0.5.23`
-- catkin_pkg version: `0.2.10`
-- rosdep version: `0.11.5`
-- rosdistro version: `0.5.0`
-- vcstools version: `0.1.39`
-
-
-## homer_msgs (kinetic) - 0.1.4-0
-
-The packages in the `homer_msgs` repository were released into the `kinetic` distro by running `/usr/bin/bloom-release --rosdistro kinetic --track kinetic homer_msgs` on `Wed, 02 Nov 2016 14:20:23 -0000`
-
-These packages were released:
-- `homer_msgs`
-- `homer_ptu_msgs`
-
-Version of package(s) in repository `homer_msgs`:
-
-- upstream repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
-- release repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
-- rosdistro version: `0.1.3-0`
-- old version: `0.1.3-0`
-- new version: `0.1.4-0`
-
-Versions of tools used:
-
-- bloom version: `0.5.23`
-- catkin_pkg version: `0.2.10`
-- rosdep version: `0.11.5`
-- rosdistro version: `0.5.0`
-- vcstools version: `0.1.39`
-
-
-## homer_msgs (kinetic) - 0.1.3-0
-
-The packages in the `homer_msgs` repository were released into the `kinetic` distro by running `/usr/bin/bloom-release --rosdistro kinetic --track kinetic homer_msgs` on `Wed, 02 Nov 2016 13:55:17 -0000`
-
-These packages were released:
-- `homer_msgs`
-- `homer_ptu_msgs`
-
-Version of package(s) in repository `homer_msgs`:
-
-- upstream repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
-- release repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
-- rosdistro version: `0.1.2-0`
-- old version: `0.1.2-0`
-- new version: `0.1.3-0`
-
-Versions of tools used:
-
-- bloom version: `0.5.23`
-- catkin_pkg version: `0.2.10`
-- rosdep version: `0.11.5`
-- rosdistro version: `0.5.0`
-- vcstools version: `0.1.39`
-
-
-## homer_msgs (kinetic) - 0.1.2-0
-
-The packages in the `homer_msgs` repository were released into the `kinetic` distro by running `/usr/bin/bloom-release --rosdistro kinetic --track kinetic homer_msgs` on `Wed, 02 Nov 2016 13:33:39 -0000`
-
-These packages were released:
-- `homer_msgs`
-- `homer_ptu_msgs`
-
-Version of package(s) in repository `homer_msgs`:
-
-- upstream repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
-- release repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
-- rosdistro version: `0.1.1-1`
-- old version: `0.1.1-1`
-- new version: `0.1.2-0`
-
-Versions of tools used:
-
-- bloom version: `0.5.23`
-- catkin_pkg version: `0.2.10`
-- rosdep version: `0.11.5`
-- rosdistro version: `0.5.0`
-- vcstools version: `0.1.39`
-
-
-## homer_msgs (kinetic) - 0.1.1-1
-
-The packages in the `homer_msgs` repository were released into the `kinetic` distro by running `/usr/bin/bloom-release --rosdistro kinetic --track kinetic homer_msgs --edit` on `Tue, 01 Nov 2016 12:54:29 -0000`
-
-The `homer_msgs` package was released.
-
-Version of package(s) in repository `homer_msgs`:
-
-- upstream repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
-- release repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
-- rosdistro version: `0.1.1-0`
-- old version: `0.1.1-0`
-- new version: `0.1.1-1`
-
-Versions of tools used:
-
-- bloom version: `0.5.23`
-- catkin_pkg version: `0.2.10`
-- rosdep version: `0.11.5`
-- rosdistro version: `0.5.0`
-- vcstools version: `0.1.39`
-
-
-## homer_msgs (kinetic) - 0.1.1-0
-
-The packages in the `homer_msgs` repository were released into the `kinetic` distro by running `/usr/bin/bloom-release --rosdistro kinetic --track kinetic homer_msgs` on `Tue, 01 Nov 2016 12:13:07 -0000`
-
-The `homer_msgs` package was released.
-
-Version of package(s) in repository `homer_msgs`:
-
-- upstream repository: git@gitlab.uni-koblenz.de:robbie/homer_msgs.git
-- release repository: unknown
-- rosdistro version: `null`
-- old version: `null`
-- new version: `0.1.1-0`
-
-Versions of tools used:
-
-- bloom version: `0.5.23`
-- catkin_pkg version: `0.2.10`
-- rosdep version: `0.11.5`
-- rosdistro version: `0.4.7`
-- vcstools version: `0.1.39`
-
+# Package homer_msgs
+This package contains messages and services which are used by different nodes in common.
+The documentation for the message and services is contained by the message files itself.
 
diff --git a/homer_msgs/action/Empty.action b/action/Empty.action
similarity index 100%
rename from homer_msgs/action/Empty.action
rename to action/Empty.action
diff --git a/homer_msgs/action/OpenDoor.action b/action/OpenDoor.action
similarity index 100%
rename from homer_msgs/action/OpenDoor.action
rename to action/OpenDoor.action
diff --git a/homer_msgs/.clang-format b/homer_msgs/.clang-format
deleted file mode 100644
index 24fd1c0995299179bb14a28da690771368bdc10f..0000000000000000000000000000000000000000
--- a/homer_msgs/.clang-format
+++ /dev/null
@@ -1,64 +0,0 @@
----
-Language:        Cpp
-# BasedOnStyle:  WebKit
-AccessModifierOffset: -4
-AlignAfterOpenBracket: false
-AlignEscapedNewlinesLeft: false
-AlignOperands:   false
-AlignTrailingComments: false
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: Inline
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: false
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: false
-BinPackArguments: true
-BinPackParameters: true
-BreakBeforeBinaryOperators: All
-BreakBeforeBraces: Allman
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: true
-ColumnLimit:     100
-CommentPragmas:  '^ IWYU pragma:'
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: false
-DerivePointerAlignment: false
-DisableFormat:   false
-ExperimentalAutoDetectBinPacking: false
-ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IndentCaseLabels: false
-IndentWidth:     4
-IndentWrappedFunctionNames: false
-KeepEmptyLinesAtTheStartOfBlocks: true
-MaxEmptyLinesToKeep: 2
-NamespaceIndentation: Inner
-ObjCBlockIndentWidth: 4
-ObjCSpaceAfterProperty: true
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Left
-SpaceAfterCStyleCast: false
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard:        Cpp11
-TabWidth:        4
-UseTab:          Never
-...
-
diff --git a/homer_msgs/README.md b/homer_msgs/README.md
deleted file mode 100644
index 9a183aa44bd20292f542a4b80b1da913281881c0..0000000000000000000000000000000000000000
--- a/homer_msgs/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Package homer_msgs
-This package contains messages and services which are used by different nodes in common.
-The documentation for the message and services is contained by the message files itself.
-
diff --git a/homer_msgs/include/homer_msgs/processing_log_helper.h b/include/homer_msgs/processing_log_helper.h
similarity index 100%
rename from homer_msgs/include/homer_msgs/processing_log_helper.h
rename to include/homer_msgs/processing_log_helper.h
diff --git a/homer_msgs/msg/Detection2D.msg b/msg/Detection2D.msg
similarity index 100%
rename from homer_msgs/msg/Detection2D.msg
rename to msg/Detection2D.msg
diff --git a/homer_msgs/msg/Detections2D.msg b/msg/Detections2D.msg
similarity index 100%
rename from homer_msgs/msg/Detections2D.msg
rename to msg/Detections2D.msg
diff --git a/homer_msgs/msg/Face.msg b/msg/Face.msg
similarity index 100%
rename from homer_msgs/msg/Face.msg
rename to msg/Face.msg
diff --git a/homer_msgs/msg/HumanPose.msg b/msg/HumanPose.msg
similarity index 100%
rename from homer_msgs/msg/HumanPose.msg
rename to msg/HumanPose.msg
diff --git a/homer_msgs/msg/NodeProcessingSummary.msg b/msg/NodeProcessingSummary.msg
similarity index 100%
rename from homer_msgs/msg/NodeProcessingSummary.msg
rename to msg/NodeProcessingSummary.msg
diff --git a/homer_msgs/msg/People.msg b/msg/People.msg
similarity index 100%
rename from homer_msgs/msg/People.msg
rename to msg/People.msg
diff --git a/homer_msgs/msg/Person.msg b/msg/Person.msg
similarity index 100%
rename from homer_msgs/msg/Person.msg
rename to msg/Person.msg
diff --git a/homer_msgs/msg/ProcessingInfo.msg b/msg/ProcessingInfo.msg
similarity index 100%
rename from homer_msgs/msg/ProcessingInfo.msg
rename to msg/ProcessingInfo.msg
diff --git a/homer_msgs/msg/RGBDFrame.msg b/msg/RGBDFrame.msg
similarity index 100%
rename from homer_msgs/msg/RGBDFrame.msg
rename to msg/RGBDFrame.msg
diff --git a/homer_msgs/msg/RGBDFrameOrig.msg b/msg/RGBDFrameOrig.msg
similarity index 100%
rename from homer_msgs/msg/RGBDFrameOrig.msg
rename to msg/RGBDFrameOrig.msg
diff --git a/homer_msgs/msg/YoloRGBDFrame.msg b/msg/YoloRGBDFrame.msg
similarity index 100%
rename from homer_msgs/msg/YoloRGBDFrame.msg
rename to msg/YoloRGBDFrame.msg
diff --git a/homer_msgs/package.xml b/package.xml
similarity index 100%
rename from homer_msgs/package.xml
rename to package.xml
diff --git a/homer_msgs/srv/GetPeople.srv b/srv/GetPeople.srv
similarity index 100%
rename from homer_msgs/srv/GetPeople.srv
rename to srv/GetPeople.srv
diff --git a/homer_msgs/srv/SetString.srv b/srv/SetString.srv
similarity index 100%
rename from homer_msgs/srv/SetString.srv
rename to srv/SetString.srv