Merge lp:~mandel/ubuntu-download-manager/second-reorg into lp:ubuntu-download-manager

[Manuel de la Peña]

Organize project simpler so that new developers find it easier to move arround the code.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:320
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/389/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/278/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/278/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/389/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/second-reorg]

321. By Manuel de la Peña on 2014-03-31

Merged add-mng-class into second-reorg.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:321
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/399/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/288
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/288/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/399/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/second-reorg]

322. By Manuel de la Peña on 2014-04-01

Merged add-mng-class into second-reorg.

323. By Manuel de la Peña on 2014-04-01

Merged add-mng-class into second-reorg.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:322
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/408/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/297/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/297/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/408/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:323
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/421/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/310/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/310/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/421/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/second-reorg]

324. By Manuel de la Peña on 2014-04-01

Merged add-mng-class into second-reorg.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:324
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/433/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/322/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/322/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/433/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/second-reorg]

325. By Manuel de la Peña on 2014-04-02

Merged add-mng-class into second-reorg.

326. By Manuel de la Peña on 2014-04-02

Merged add-mng-class into second-reorg.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:325
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/445/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/334/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/334/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/445/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:326
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/457/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/346/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/346/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/457/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/second-reorg]

327. By Manuel de la Peña on 2014-04-02

Merged add-mng-class into second-reorg.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:327
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/465/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/354/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/354/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/465/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/second-reorg]

328. By Manuel de la Peña on 2014-04-03

Merged add-mng-class into second-reorg.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:328
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/477/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/366
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/366/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/477/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/second-reorg]

329. By Manuel de la Peña on 2014-04-03

Fix merge issue.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:329
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/502/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/392
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/391/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/502/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/second-reorg]

330. By Manuel de la Peña on 2014-04-03

Merged add-mng-class into second-reorg.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:330
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/507/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/397
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/396/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/507/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/second-reorg]

331. By Manuel de la Peña on 2014-04-07

Merged add-mng-class into second-reorg.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:331
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/520/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/410
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/409/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/520/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/second-reorg]

332. By Manuel de la Peña on 2014-04-07

Merged add-mng-class into second-reorg.

333. By Manuel de la Peña on 2014-04-07

Merged add-mng-class into second-reorg.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:333
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/532/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/422
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/421/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/532/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/second-reorg]

334. By Manuel de la Peña on 2014-04-07

Merged add-mng-class into second-reorg.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:334
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/541/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/431
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/430/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/541/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/second-reorg]

335. By Manuel de la Peña on 2014-04-08

Merged add-mng-class into second-reorg.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:335
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/553/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/443
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/442/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/553/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/second-reorg]

336. By Manuel de la Peña on 2014-04-08

Merged add-mng-class into second-reorg.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:336
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/567/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/457
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/456/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/567/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-download-manager/second-reorg]

337. By Manuel de la Peña on 2014-04-09

Merged add-mng-class into second-reorg.

338. By Manuel de la Peña on 2014-04-09

Merged add-mng-class into second-reorg.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:337
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/582/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/472
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/471

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/582/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:338
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/595/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/485
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/484

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/595/rebuild

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/second-reorg]

339. By Manuel de la Peña on 2014-04-09

Merged add-mng-class into second-reorg.

340. By Manuel de la Peña on 2014-04-09

Merged add-mng-class into second-reorg.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:340
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/607/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/497
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/496

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/607/rebuild

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/second-reorg]

341. By Manuel de la Peña on 2014-04-15

Merged add-mng-class into second-reorg.

342. By Manuel de la Peña on 2014-04-15

Merged add-mng-class into second-reorg.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:342
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/625/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/515
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/514

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-download-manager-ci/625/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-04-15 15:31:35 +0000
+++ CMakeLists.txt	2014-04-15 15:31:36 +0000
@@ -69,15 +69,5 @@
 	add_definitions(-DQT_NO_DEBUG)
 endif()
 
-add_subdirectory(udm-common)
-add_subdirectory(udm-priv-common)
-add_subdirectory(ubuntu-download-manager-common)
-add_subdirectory(ubuntu-download-manager-priv)
-add_subdirectory(ubuntu-download-manager)
-add_subdirectory(ubuntu-download-manager-client)
-add_subdirectory(ubuntu-download-manager-test-daemon)
-add_subdirectory(ubuntu-download-manager-plugin)
-add_subdirectory(ubuntu-upload-manager-common)
-add_subdirectory(ubuntu-upload-manager-priv)
-add_subdirectory(ubuntu-upload-manager)
+add_subdirectory(src)
 add_subdirectory(tests)

=== added directory 'src'
=== added file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/CMakeLists.txt	2014-04-15 15:31:36 +0000
@@ -0,0 +1,19 @@
+# Copyright © 2013 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Manuel de la Peña <[e-mail]>
+
+add_subdirectory(common)
+add_subdirectory(downloads)
+add_subdirectory(uploads)

=== added directory 'src/common'
=== added file 'src/common/CMakeLists.txt'
--- src/common/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/common/CMakeLists.txt	2014-04-15 15:31:36 +0000
@@ -0,0 +1,18 @@
+# Copyright © 2013 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Manuel de la Peña <[e-mail]>
+
+add_subdirectory(priv)
+add_subdirectory(public)

=== renamed directory 'udm-priv-common' => 'src/common/priv'
=== modified file 'src/common/priv/CMakeLists.txt'
--- udm-priv-common/CMakeLists.txt	2014-04-15 15:31:35 +0000
+++ src/common/priv/CMakeLists.txt	2014-04-15 15:31:36 +0000
@@ -53,9 +53,9 @@
 include_directories(${Qt5Network_INCLUDE_DIRS})
 include_directories(${Qt5Sql_INCLUDE_DIRS})
 include_directories(${DBUS_INCLUDE_DIRS})
-include_directories(${CMAKE_SOURCE_DIR}/udm-common)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
 
 add_library(${TARGET} SHARED
 	${HEADERS}

=== renamed directory 'udm-common' => 'src/common/public'
=== added directory 'src/downloads'
=== added file 'src/downloads/CMakeLists.txt'
--- src/downloads/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/downloads/CMakeLists.txt	2014-04-15 15:31:36 +0000
@@ -0,0 +1,22 @@
+# Copyright © 2013 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Manuel de la Peña <[e-mail]>
+
+add_subdirectory(client)
+add_subdirectory(common)
+add_subdirectory(daemon)
+add_subdirectory(priv)
+add_subdirectory(qml)
+add_subdirectory(test-daemon)

=== renamed directory 'ubuntu-download-manager-client' => 'src/downloads/client'
=== modified file 'src/downloads/client/CMakeLists.txt'
--- ubuntu-download-manager-client/CMakeLists.txt	2014-04-15 15:31:35 +0000
+++ src/downloads/client/CMakeLists.txt	2014-04-15 15:31:36 +0000
@@ -32,10 +32,10 @@
 
 include_directories(${Qt5DBus_INCLUDE_DIRS})
 include_directories(${Qt5Network_INCLUDE_DIRS})
-include_directories(${CMAKE_SOURCE_DIR}/udm-common)
-include_directories(${CMAKE_SOURCE_DIR}/ubuntu-download-manager-common)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/common)
 
 add_library(${TARGET} SHARED 
 	${SOURCES}

=== renamed directory 'ubuntu-download-manager-common' => 'src/downloads/common'
=== modified file 'src/downloads/common/CMakeLists.txt'
--- ubuntu-download-manager-common/CMakeLists.txt	2014-04-15 15:31:35 +0000
+++ src/downloads/common/CMakeLists.txt	2014-04-15 15:31:36 +0000
@@ -19,9 +19,9 @@
 
 include_directories(${Qt5DBus_INCLUDE_DIRS})
 include_directories(${Qt5Network_INCLUDE_DIRS})
-include_directories(${CMAKE_SOURCE_DIR}/udm-common)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
 
 add_library(${TARGET} SHARED 
 	${SOURCES}

=== renamed directory 'ubuntu-download-manager' => 'src/downloads/daemon'
=== modified file 'src/downloads/daemon/CMakeLists.txt'
--- ubuntu-download-manager/CMakeLists.txt	2014-04-15 15:31:35 +0000
+++ src/downloads/daemon/CMakeLists.txt	2014-04-15 15:31:36 +0000
@@ -5,12 +5,12 @@
 )
 
 include_directories(${Qt5Core_INCLUDE_DIRS})
-include_directories(${CMAKE_SOURCE_DIR}/udm-common)
-include_directories(${CMAKE_SOURCE_DIR}/udm-priv-common)
-include_directories(${CMAKE_SOURCE_DIR}/ubuntu-download-manager-common)
-include_directories(${CMAKE_SOURCE_DIR}/ubuntu-download-manager-priv)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
+include_directories(${CMAKE_SOURCE_DIR}/src/common/priv)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/common)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/priv)
 
 link_directories(${NIH_DBUS_LIBDIR})
 link_directories(${GLOG_DBUS_LIBDIR})

=== renamed directory 'ubuntu-download-manager-priv' => 'src/downloads/priv'
=== modified file 'src/downloads/priv/CMakeLists.txt'
--- ubuntu-download-manager-priv/CMakeLists.txt	2014-04-15 15:31:35 +0000
+++ src/downloads/priv/CMakeLists.txt	2014-04-15 15:31:36 +0000
@@ -45,11 +45,11 @@
 include_directories(${Qt5Network_INCLUDE_DIRS})
 include_directories(${Qt5Sql_INCLUDE_DIRS})
 include_directories(${DBUS_INCLUDE_DIRS})
-include_directories(${CMAKE_SOURCE_DIR}/udm-common)
-include_directories(${CMAKE_SOURCE_DIR}/udm-priv-common)
-include_directories(${CMAKE_SOURCE_DIR}/ubuntu-download-manager-common)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
+include_directories(${CMAKE_SOURCE_DIR}/src/common/priv)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/common)
 
 add_library(${TARGET} STATIC
 	${HEADERS}

=== renamed directory 'ubuntu-download-manager-plugin' => 'src/downloads/qml'
=== modified file 'src/downloads/qml/CMakeLists.txt'
--- ubuntu-download-manager-plugin/CMakeLists.txt	2014-04-15 15:31:35 +0000
+++ src/downloads/qml/CMakeLists.txt	2014-04-15 15:31:36 +0000
@@ -15,9 +15,9 @@
     single_download.h
 )
 
-include_directories(${CMAKE_SOURCE_DIR}/udm-common)
-include_directories(${CMAKE_SOURCE_DIR}/ubuntu-download-manager-common)
-include_directories(${CMAKE_SOURCE_DIR}/ubuntu-download-manager-client)
+include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/common)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/client)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 

=== renamed directory 'ubuntu-download-manager-test-daemon' => 'src/downloads/test-daemon'
=== modified file 'src/downloads/test-daemon/CMakeLists.txt'
--- ubuntu-download-manager-test-daemon/CMakeLists.txt	2014-04-15 15:31:35 +0000
+++ src/downloads/test-daemon/CMakeLists.txt	2014-04-15 15:31:36 +0000
@@ -22,12 +22,12 @@
 include_directories(${Qt5Network_INCLUDE_DIRS})
 include_directories(${Qt5Sql_INCLUDE_DIRS})
 include_directories(${Qt5SystemInfo_INCLUDE_DIRS})
-include_directories(${CMAKE_SOURCE_DIR}/udm-common)
-include_directories(${CMAKE_SOURCE_DIR}/udm-priv-common)
-include_directories(${CMAKE_SOURCE_DIR}/ubuntu-download-manager-common)
-include_directories(${CMAKE_SOURCE_DIR}/ubuntu-download-manager-priv)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
+include_directories(${CMAKE_SOURCE_DIR}/src/common/priv)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/common)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/priv)
 
 link_directories(${NIH_DBUS_LIBDIR})
 link_directories(${GLOG_DBUS_LIBDIR})

=== added directory 'src/uploads'
=== added file 'src/uploads/CMakeLists.txt'
--- src/uploads/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/uploads/CMakeLists.txt	2014-04-15 15:31:36 +0000
@@ -0,0 +1,19 @@
+# Copyright © 2013 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Manuel de la Peña <[e-mail]>
+
+add_subdirectory(common)
+add_subdirectory(daemon)
+add_subdirectory(priv)

=== renamed directory 'ubuntu-upload-manager-common' => 'src/uploads/common'
=== modified file 'src/uploads/common/CMakeLists.txt'
--- ubuntu-upload-manager-common/CMakeLists.txt	2014-04-15 15:31:35 +0000
+++ src/uploads/common/CMakeLists.txt	2014-04-15 15:31:36 +0000
@@ -15,9 +15,9 @@
 
 include_directories(${Qt5DBus_INCLUDE_DIRS})
 include_directories(${Qt5Network_INCLUDE_DIRS})
-include_directories(${CMAKE_SOURCE_DIR}/udm-common)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
 
 add_library(${TARGET} SHARED 
 	${SOURCES}

=== renamed directory 'ubuntu-upload-manager' => 'src/uploads/daemon'
=== modified file 'src/uploads/daemon/CMakeLists.txt'
--- ubuntu-upload-manager/CMakeLists.txt	2014-04-15 15:31:35 +0000
+++ src/uploads/daemon/CMakeLists.txt	2014-04-15 15:31:36 +0000
@@ -5,12 +5,12 @@
 )
 
 include_directories(${Qt5Core_INCLUDE_DIRS})
-include_directories(${CMAKE_SOURCE_DIR}/udm-common)
-include_directories(${CMAKE_SOURCE_DIR}/udm-priv-common)
-include_directories(${CMAKE_SOURCE_DIR}/ubuntu-upload-manager-common)
-include_directories(${CMAKE_SOURCE_DIR}/ubuntu-upload-manager-priv)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
+include_directories(${CMAKE_SOURCE_DIR}/src/common/priv)
+include_directories(${CMAKE_SOURCE_DIR}/src/uploads/common)
+include_directories(${CMAKE_SOURCE_DIR}/src/uploads/priv)
 
 link_directories(${NIH_DBUS_LIBDIR})
 link_directories(${GLOG_DBUS_LIBDIR})

=== renamed directory 'ubuntu-upload-manager-priv' => 'src/uploads/priv'
=== modified file 'src/uploads/priv/CMakeLists.txt'
--- ubuntu-upload-manager-priv/CMakeLists.txt	2014-04-15 15:31:35 +0000
+++ src/uploads/priv/CMakeLists.txt	2014-04-15 15:31:36 +0000
@@ -31,11 +31,11 @@
 include_directories(${Qt5Network_INCLUDE_DIRS})
 include_directories(${Qt5Sql_INCLUDE_DIRS})
 include_directories(${DBUS_INCLUDE_DIRS})
-include_directories(${CMAKE_SOURCE_DIR}/udm-common)
-include_directories(${CMAKE_SOURCE_DIR}/udm-priv-common)
-include_directories(${CMAKE_SOURCE_DIR}/ubuntu-upload-manager-common)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
+include_directories(${CMAKE_SOURCE_DIR}/src/common/priv)
+include_directories(${CMAKE_SOURCE_DIR}/src/uploads/common)
 
 add_library(${TARGET} STATIC
 	${HEADERS}

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-04-15 15:31:35 +0000
+++ tests/CMakeLists.txt	2014-04-15 15:31:36 +0000
@@ -92,13 +92,13 @@
 include_directories(${DBUS_INCLUDE_DIRS})
 include_directories(${GTEST_INCLUDE_DIRS})
 include_directories(${GMOCK_INCLUDE_DIRS})
-include_directories(${CMAKE_SOURCE_DIR}/udm-common)
-include_directories(${CMAKE_SOURCE_DIR}/udm-priv-common)
-include_directories(${CMAKE_SOURCE_DIR}/ubuntu-download-manager-common)
-include_directories(${CMAKE_SOURCE_DIR}/ubuntu-download-manager-client)
-include_directories(${CMAKE_SOURCE_DIR}/ubuntu-download-manager-priv)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/src/common/public)
+include_directories(${CMAKE_SOURCE_DIR}/src/common/priv)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/common)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/client)
+include_directories(${CMAKE_SOURCE_DIR}/src/downloads/priv)
 
 link_directories(${NIH_DBUS_LIBDIR})
 link_directories(${GLOG_DBUS_LIBDIR})

=== modified file 'tests/local_tree_testcase.cpp'
--- tests/local_tree_testcase.cpp	2014-01-24 11:24:40 +0000
+++ tests/local_tree_testcase.cpp	2014-04-15 15:31:36 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "local_tree_testcase.h"
-#define TEST_DAEMON "../ubuntu-download-manager-test-daemon/ubuntu-download-manager-test-daemon"
+#define TEST_DAEMON "../src/downloads/test-daemon/ubuntu-download-manager-test-daemon"
 #define LARGE_FILE "otasigned.zip"
 #define SMALL_FILE "index.json"