diff --git a/CHANGELOG.rst b/app_manager/CHANGELOG.rst
similarity index 100%
rename from CHANGELOG.rst
rename to app_manager/CHANGELOG.rst
diff --git a/CMakeLists.txt b/app_manager/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to app_manager/CMakeLists.txt
diff --git a/README.md b/app_manager/README.md
similarity index 100%
rename from README.md
rename to app_manager/README.md
diff --git a/bin/appmaster b/app_manager/bin/appmaster
similarity index 100%
rename from bin/appmaster
rename to app_manager/bin/appmaster
diff --git a/bin/rosget b/app_manager/bin/rosget
similarity index 100%
rename from bin/rosget
rename to app_manager/bin/rosget
diff --git a/launch/app_manager.launch b/app_manager/launch/app_manager.launch
similarity index 100%
rename from launch/app_manager.launch
rename to app_manager/launch/app_manager.launch
diff --git a/msg/App.msg b/app_manager/msg/App.msg
similarity index 100%
rename from msg/App.msg
rename to app_manager/msg/App.msg
diff --git a/msg/AppInstallationState.msg b/app_manager/msg/AppInstallationState.msg
similarity index 100%
rename from msg/AppInstallationState.msg
rename to app_manager/msg/AppInstallationState.msg
diff --git a/msg/AppList.msg b/app_manager/msg/AppList.msg
similarity index 100%
rename from msg/AppList.msg
rename to app_manager/msg/AppList.msg
diff --git a/msg/AppStatus.msg b/app_manager/msg/AppStatus.msg
similarity index 100%
rename from msg/AppStatus.msg
rename to app_manager/msg/AppStatus.msg
diff --git a/msg/ClientApp.msg b/app_manager/msg/ClientApp.msg
similarity index 100%
rename from msg/ClientApp.msg
rename to app_manager/msg/ClientApp.msg
diff --git a/msg/ExchangeApp.msg b/app_manager/msg/ExchangeApp.msg
similarity index 100%
rename from msg/ExchangeApp.msg
rename to app_manager/msg/ExchangeApp.msg
diff --git a/msg/Icon.msg b/app_manager/msg/Icon.msg
similarity index 100%
rename from msg/Icon.msg
rename to app_manager/msg/Icon.msg
diff --git a/msg/KeyValue.msg b/app_manager/msg/KeyValue.msg
similarity index 100%
rename from msg/KeyValue.msg
rename to app_manager/msg/KeyValue.msg
diff --git a/msg/StatusCodes.msg b/app_manager/msg/StatusCodes.msg
similarity index 100%
rename from msg/StatusCodes.msg
rename to app_manager/msg/StatusCodes.msg
diff --git a/package.xml b/app_manager/package.xml
similarity index 100%
rename from package.xml
rename to app_manager/package.xml
diff --git a/scripts/app_manager b/app_manager/scripts/app_manager
similarity index 100%
rename from scripts/app_manager
rename to app_manager/scripts/app_manager
diff --git a/scripts/test_app.py b/app_manager/scripts/test_app.py
similarity index 100%
rename from scripts/test_app.py
rename to app_manager/scripts/test_app.py
diff --git a/setup.py b/app_manager/setup.py
similarity index 100%
rename from setup.py
rename to app_manager/setup.py
diff --git a/src/app_manager/__init__.py b/app_manager/src/app_manager/__init__.py
similarity index 100%
rename from src/app_manager/__init__.py
rename to app_manager/src/app_manager/__init__.py
diff --git a/src/app_manager/app.py b/app_manager/src/app_manager/app.py
similarity index 100%
rename from src/app_manager/app.py
rename to app_manager/src/app_manager/app.py
diff --git a/src/app_manager/app_list.py b/app_manager/src/app_manager/app_list.py
similarity index 100%
rename from src/app_manager/app_list.py
rename to app_manager/src/app_manager/app_list.py
diff --git a/src/app_manager/app_manager.py b/app_manager/src/app_manager/app_manager.py
similarity index 100%
rename from src/app_manager/app_manager.py
rename to app_manager/src/app_manager/app_manager.py
diff --git a/src/app_manager/app_manager_plugin.py b/app_manager/src/app_manager/app_manager_plugin.py
similarity index 100%
rename from src/app_manager/app_manager_plugin.py
rename to app_manager/src/app_manager/app_manager_plugin.py
diff --git a/src/app_manager/exceptions.py b/app_manager/src/app_manager/exceptions.py
similarity index 100%
rename from src/app_manager/exceptions.py
rename to app_manager/src/app_manager/exceptions.py
diff --git a/src/app_manager/exchange.py b/app_manager/src/app_manager/exchange.py
similarity index 100%
rename from src/app_manager/exchange.py
rename to app_manager/src/app_manager/exchange.py
diff --git a/src/app_manager/master_sync.py b/app_manager/src/app_manager/master_sync.py
similarity index 100%
rename from src/app_manager/master_sync.py
rename to app_manager/src/app_manager/master_sync.py
diff --git a/srv/GetAppDetails.srv b/app_manager/srv/GetAppDetails.srv
similarity index 100%
rename from srv/GetAppDetails.srv
rename to app_manager/srv/GetAppDetails.srv
diff --git a/srv/GetInstallationState.srv b/app_manager/srv/GetInstallationState.srv
similarity index 100%
rename from srv/GetInstallationState.srv
rename to app_manager/srv/GetInstallationState.srv
diff --git a/srv/InstallApp.srv b/app_manager/srv/InstallApp.srv
similarity index 100%
rename from srv/InstallApp.srv
rename to app_manager/srv/InstallApp.srv
diff --git a/srv/ListApps.srv b/app_manager/srv/ListApps.srv
similarity index 100%
rename from srv/ListApps.srv
rename to app_manager/srv/ListApps.srv
diff --git a/srv/StartApp.srv b/app_manager/srv/StartApp.srv
similarity index 100%
rename from srv/StartApp.srv
rename to app_manager/srv/StartApp.srv
diff --git a/srv/StopApp.srv b/app_manager/srv/StopApp.srv
similarity index 100%
rename from srv/StopApp.srv
rename to app_manager/srv/StopApp.srv
diff --git a/srv/UninstallApp.srv b/app_manager/srv/UninstallApp.srv
similarity index 100%
rename from srv/UninstallApp.srv
rename to app_manager/srv/UninstallApp.srv
diff --git a/test/appA.app b/app_manager/test/appA.app
similarity index 100%
rename from test/appA.app
rename to app_manager/test/appA.app
diff --git a/test/applist0/.gitignore b/app_manager/test/applist0/.gitignore
similarity index 100%
rename from test/applist0/.gitignore
rename to app_manager/test/applist0/.gitignore
diff --git a/test/applist1/apps1.installed b/app_manager/test/applist1/apps1.installed
similarity index 100%
rename from test/applist1/apps1.installed
rename to app_manager/test/applist1/apps1.installed
diff --git a/test/applistbad/bad.installed b/app_manager/test/applistbad/bad.installed
similarity index 100%
rename from test/applistbad/bad.installed
rename to app_manager/test/applistbad/bad.installed
diff --git a/test/applistbad/bad2.installed b/app_manager/test/applistbad/bad2.installed
similarity index 100%
rename from test/applistbad/bad2.installed
rename to app_manager/test/applistbad/bad2.installed
diff --git a/test/empty.interface b/app_manager/test/empty.interface
similarity index 100%
rename from test/empty.interface
rename to app_manager/test/empty.interface
diff --git a/test/plugin/__init__.py b/app_manager/test/plugin/__init__.py
similarity index 100%
rename from test/plugin/__init__.py
rename to app_manager/test/plugin/__init__.py
diff --git a/test/plugin/package.xml b/app_manager/test/plugin/package.xml
similarity index 100%
rename from test/plugin/package.xml
rename to app_manager/test/plugin/package.xml
diff --git a/test/plugin/plugin.installed b/app_manager/test/plugin/plugin.installed
similarity index 100%
rename from test/plugin/plugin.installed
rename to app_manager/test/plugin/plugin.installed
diff --git a/test/plugin/plugin.yaml b/app_manager/test/plugin/plugin.yaml
similarity index 100%
rename from test/plugin/plugin.yaml
rename to app_manager/test/plugin/plugin.yaml
diff --git a/test/plugin/sample_node.py b/app_manager/test/plugin/sample_node.py
similarity index 100%
rename from test/plugin/sample_node.py
rename to app_manager/test/plugin/sample_node.py
diff --git a/test/plugin/sample_node.xml b/app_manager/test/plugin/sample_node.xml
similarity index 100%
rename from test/plugin/sample_node.xml
rename to app_manager/test/plugin/sample_node.xml
diff --git a/test/plugin/test_plugin.app b/app_manager/test/plugin/test_plugin.app
similarity index 100%
rename from test/plugin/test_plugin.app
rename to app_manager/test/plugin/test_plugin.app
diff --git a/test/plugin/test_plugin.interface b/app_manager/test/plugin/test_plugin.interface
similarity index 100%
rename from test/plugin/test_plugin.interface
rename to app_manager/test/plugin/test_plugin.interface
diff --git a/test/plugin/test_plugin.py b/app_manager/test/plugin/test_plugin.py
similarity index 100%
rename from test/plugin/test_plugin.py
rename to app_manager/test/plugin/test_plugin.py
diff --git a/test/resources/example-min.launch b/app_manager/test/resources/example-min.launch
similarity index 100%
rename from test/resources/example-min.launch
rename to app_manager/test/resources/example-min.launch
diff --git a/test/test1.interface b/app_manager/test/test1.interface
similarity index 100%
rename from test/test1.interface
rename to app_manager/test/test1.interface
diff --git a/test/test_app.py b/app_manager/test/test_app.py
similarity index 100%
rename from test/test_app.py
rename to app_manager/test/test_app.py
diff --git a/test/test_app.test b/app_manager/test/test_app.test
similarity index 100%
rename from test/test_app.test
rename to app_manager/test/test_app.test
diff --git a/test/test_app_list.py b/app_manager/test/test_app_list.py
similarity index 100%
rename from test/test_app_list.py
rename to app_manager/test/test_app_list.py
diff --git a/test/test_plugin.py b/app_manager/test/test_plugin.py
similarity index 100%
rename from test/test_plugin.py
rename to app_manager/test/test_plugin.py
diff --git a/test/test_plugin.test b/app_manager/test/test_plugin.test
similarity index 100%
rename from test/test_plugin.test
rename to app_manager/test/test_plugin.test
diff --git a/test/test_start_fail.py b/app_manager/test/test_start_fail.py
similarity index 100%
rename from test/test_start_fail.py
rename to app_manager/test/test_start_fail.py
diff --git a/test/test_start_fail.test b/app_manager/test/test_start_fail.test
similarity index 100%
rename from test/test_start_fail.test
rename to app_manager/test/test_start_fail.test
diff --git a/test/test_stop_app.py b/app_manager/test/test_stop_app.py
similarity index 100%
rename from test/test_stop_app.py
rename to app_manager/test/test_stop_app.py