3 files changed, 11 insertions, 12 deletions

diff --git a/noncore/applets/memoryapplet/memoryapplet.pro b/noncore/applets/memoryapplet/memoryapplet.pro
index eafabce..cd3f4a5 100644
--- a/noncore/applets/memoryapplet/memoryapplet.pro
+++ b/noncore/applets/memoryapplet/memoryapplet.pro
@@ -1,14 +1,14 @@
 TEMPLATE    = lib
 CONFIG      += qt plugin warn_on release
-HEADERS     = ../../apps/sysinfo/graph.h \
-            ../../apps/sysinfo/load.h  \
-            ../../apps/sysinfo/memory.h  \
+HEADERS     = ../../settings/sysinfo/graph.h \
+            ../../settings/sysinfo/load.h  \
+            ../../settings/sysinfo/memory.h  \
             memoryappletimpl.h  \
             memorymeter.h  \
             memorystatus.h \
             swapfile.h
-SOURCES     = ../../apps/sysinfo/graph.cpp \
-            ../../apps/sysinfo/load.cpp \
-            ../../apps/sysinfo/memory.cpp \
+SOURCES     = ../../settings/sysinfo/graph.cpp \
+            ../../settings/sysinfo/load.cpp \
+            ../../settings/sysinfo/memory.cpp \
             memoryappletimpl.cpp  \
             memorymeter.cpp \
diff --git a/noncore/applets/memoryapplet/memorystatus.cpp b/noncore/applets/memoryapplet/memorystatus.cpp
index a800fa5..b738312 100644
--- a/noncore/applets/memoryapplet/memorystatus.cpp
+++ b/noncore/applets/memoryapplet/memorystatus.cpp
@@ -19,5 +19,5 @@
 **********************************************************************/
 #include "memorystatus.h"
-#include "../../apps/sysinfo/memory.h"
+#include "../../settings/sysinfo/memory.h"
 #include "swapfile.h"
 
diff --git a/packages b/packages
index 53f6c09..d570e85 100644
--- a/packages
+++ b/packages
@@ -3,5 +3,5 @@ CONFIG_ADVANCEDFM	noncore/apps/advancedfm	advancedfm.pro
         CONFIG_APPEARANCE2      noncore/settings/appearance2appearance2.pro
         CONFIG_APPSKEY  noncore/settings/appskeyappskey.pro
-        CONFIG_AQPKG    noncore/apps/aqpkgaqpkg.pro
+        CONFIG_AQPKG    noncore/settings/aqpkgaqpkg.pro
         CONFIG_BACKGAMMONnoncore/games/backgammon backgammon.pro
         CONFIG_BACKUP   noncore/settings/backupbackup.pro
@@ -36,5 +36,5 @@ CONFIG_EMBEDDEDKONSOLE	core/apps/embeddedkonsole	embeddedkonsole.pro
         CONFIG_EUROCONV         noncore/tools/euroconv/ euroconv.pro
         CONFIG_FIFTEEN  noncore/games/fifteenfifteen.pro
-        CONFIG_FILEBROWSER      core/apps/filebrowserfilebrowser.pro
+        CONFIG_FILEBROWSER      noncore/unsupported/filebrowserfilebrowser.pro
         CONFIG_FLAT     noncore/styles/flatflat.pro
         CONFIG_FORMATTER        noncore/tools/formatterformatter.pro
@@ -125,6 +125,5 @@ CONFIG_QASTEROIDS	noncore/games/qasteroids	qasteroids.pro
         CONFIG_QASHMONEY        noncore/apps/qashmoneyqashmoney.pro
         CONFIG_QCOP     core/apps/qcopqcop.pro
-        CONFIG_QPDF     noncore/graphics/qpdfqpdf.pro
-        CONFIG_QPDF2    noncore/graphics/qpdf2qpdf2.pro
+        CONFIG_QPDF     noncore/unsupported/qpdfqpdf.pro
 CONFIG_QUICKLAUNCHER core/tools/quicklauncher quicklauncher.pro
         CONFIG_QWS      core/qwsqws.pro
@@ -147,5 +146,5 @@ CONFIG_SOUND	noncore/settings/sound	sound.pro
         CONFIG_SSHKEYS  noncore/settings/sshkeyssshkeys.pro
         CONFIG_SUSPENDAPPLET    core/applets/suspendappletsuspendapplet.pro
-        CONFIG_SYSINFO  noncore/apps/sysinfosysinfo.pro
+        CONFIG_SYSINFO  noncore/settings/sysinfosysinfo.pro
         CONFIG_TABLEVIEWER      noncore/apps/tableviewertableviewer.pro
         CONFIG_TABMANAGER       noncore/settings/tabmanagertabmanager.pro