12 files changed, 6 insertions, 81 deletions
diff --git a/apps/Applications/addressbook.desktop b/apps/Applications/addressbook.desktop
deleted file mode 100644
index d98eba8..0000000
--- a/apps/Applications/addressbook.desktop
+++ b/dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Comment=An Address Book Program
-Exec=addressbook
-Icon=AddressBook
-Type=Application
-Name=Contacts
-MimeType=text/x-vCard
-Name[pt_BR]=Contactos
-Name[no]=Adressebok
-Name[de]=Adressbuch
-Name[hu]=Címtár
-Name[pt]=Contactos
-Name[es]=Contactos
-Name[zh_TW]=地址簿
-Name[ko]=주소록
diff --git a/apps/Applications/datebook.desktop b/apps/Applications/datebook.desktop
deleted file mode 100644
index badf43d..0000000
--- a/apps/Applications/datebook.desktop
+++ b/dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Comment=A Calendar and Scheduling Program
-Exec=datebook
-Icon=DateBook
-Type=Application
-Name=Calendar
-Name[pt_BR]=Calendário
-Name[no]=Avtalebok
-Name[de]=Termin kalender
-Name[hu]=Naptár
-Name[pt]=Calendário
-Name[es]=Calendario
-Name[zh_TW]=行事歷
-Name[ko]=일정관리
diff --git a/apps/Applications/drawpad.desktop b/apps/Applications/drawpad.desktop
deleted file mode 100644
index 29af8d0..0000000
--- a/apps/Applications/drawpad.desktop
+++ b/dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Comment=A Note Taking Program
-Exec=drawpad
-Icon=drawpad/DrawPad
-Type=Application
-Name=DrawPad
-Name[de]=Zeichenbrett
-Name[pt]=Bloco Rabiscos
-Name[es]=Pizarra
-Name[zh_TW]=小畫家
-Name[ko]=그림판
diff --git a/apps/Applications/mail.desktop b/apps/Applications/mail.desktop
deleted file mode 100644
index 617042c..0000000
--- a/apps/Applications/mail.desktop
+++ b/dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=E-Mail
-Exec=mail
-Type=Application
-Icon=mail/desktopicon
-Name[pt]=E-Mail
-Name[es]=Correo-e
-Name[zh_TW]=電郵
-Name[ko]=이메일
diff --git a/apps/Applications/today.desktop b/apps/Applications/today.desktop
deleted file mode 100644
index 8816e29..0000000
--- a/apps/Applications/today.desktop
+++ b/dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Comment=Today App
-Exec=today
-Icon=today/today_icon
-Type=Application
-Name=Today
-Name[pt_BR]=Hoje
-Name[de]=Heute
-Name[pt]=Hoje
-Name[es]=Hoy
-Name[zh_TW]=Today
-Name[ko]=오늘
diff --git a/apps/Applications/todo.desktop b/apps/Applications/todo.desktop
deleted file mode 100644
index b405a79..0000000
--- a/apps/Applications/todo.desktop
+++ b/dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Comment=A Todo List Program
-Exec=todolist
-Icon=TodoList
-Type=Application
-Name=Todo List
-Name[pt_BR]=Afazeres
-Name[no]=Oppgaveliste
-Name[de]=Aufgabenliste
-Name[hu]=Feladatok
-Name[pt]=Tarefas
-Name[es]=Tareas
-Name[zh_TW]=待辦事項
-Name[ko]=할일 목록
diff --git a/core/pim/addressbook/opie-addressbook.control b/core/pim/addressbook/opie-addressbook.control
index 95e4c7a..14b0770 100644
--- a/core/pim/addressbook/opie-addressbook.control
+++ b/core/pim/addressbook/opie-addressbook.control
@@ -1,2 +1,2 @@
-Files: bin/addressbook apps/Applications/addressbook.desktop
+Files: bin/addressbook apps/1Pim/addressbook.desktop
 Priority: optional
diff --git a/core/pim/datebook/opie-datebook.control b/core/pim/datebook/opie-datebook.control
index 6cd96ff..2ffbc0d 100644
--- a/core/pim/datebook/opie-datebook.control
+++ b/core/pim/datebook/opie-datebook.control
@@ -1,2 +1,2 @@
-Files: bin/datebook apps/Applications/datebook.desktop pics/datebook
+Files: bin/datebook apps/1Pim/datebook.desktop pics/datebook
 Priority: optional
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control
index 46c0d71..b8e2e02 100644
--- a/core/pim/today/opie-today.control
+++ b/core/pim/today/opie-today.control
@@ -1,2 +1,2 @@
-Files: bin/today apps/Applications/today.desktop pics/today/*
+Files: bin/today apps/1Pim/today.desktop pics/today/*
 Priority: optional
diff --git a/core/pim/todo/opie-todo.control b/core/pim/todo/opie-todo.control
index 71929af..31fa166 100644
--- a/core/pim/todo/opie-todo.control
+++ b/core/pim/todo/opie-todo.control
@@ -1,2 +1,2 @@
-Files: bin/todolist apps/Applications/todo.desktop
+Files: bin/todolist apps/1Pim/todo.desktop
 Priority: optional
diff --git a/noncore/graphics/drawpad/opie-drawpad.control b/noncore/graphics/drawpad/opie-drawpad.control
index 569dd9d..e3bb01d 100644
--- a/noncore/graphics/drawpad/opie-drawpad.control
+++ b/noncore/graphics/drawpad/opie-drawpad.control
@@ -1,2 +1,2 @@
-Files: bin/drawpad apps/Applications/drawpad.desktop pics/drawpad
+Files: bin/drawpad apps/1Pim/drawpad.desktop pics/drawpad
 Package: opie-drawpad
diff --git a/noncore/unsupported/mail2/opie-mail2.control b/noncore/unsupported/mail2/opie-mail2.control
index 4c267ae..544a0b9 100644
--- a/noncore/unsupported/mail2/opie-mail2.control
+++ b/noncore/unsupported/mail2/opie-mail2.control
@@ -1,2 +1,2 @@
-Files: bin/mail $QTDIR/lib/libmail.so* apps/Applications/mail.desktop pics/mail/*.png sounds/mail/*.wav
+Files: bin/mail $QTDIR/lib/libmail.so* apps/1Pim/mail.desktop pics/mail/*.png sounds/mail/*.wav
 Package: opie-mail2