diff --git a/dev/resources.qrc b/dev/resources.qrc
deleted file mode 100644
index 4546352..0000000
--- a/dev/resources.qrc
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- icons/email.png
- icons/world_go.png
- icons/tick.png
- icons/add.png
- icons/bullet_add.png
- icons/page_copy.png
- icons/add.png
- icons/cross.png
- icons/find.png
- icons/folder_page.png
- icons/information.png
- icons/magifier_zoom_out.png
- icons/magnifier_zoom_in.png
- icons/magnifier.png
- icons/wrench.png
-
-
- logos/logo32x32.png
- logos/logo64x64.png
-
-
diff --git a/dev/icons/add.png b/img/add.png
similarity index 100%
rename from dev/icons/add.png
rename to img/add.png
diff --git a/dev/icons/bullet_add.png b/img/bullet_add.png
similarity index 100%
rename from dev/icons/bullet_add.png
rename to img/bullet_add.png
diff --git a/dev/icons/cross.png b/img/cross.png
similarity index 100%
rename from dev/icons/cross.png
rename to img/cross.png
diff --git a/dev/icons/email.png b/img/email.png
similarity index 100%
rename from dev/icons/email.png
rename to img/email.png
diff --git a/dev/icons/find.png b/img/find.png
similarity index 100%
rename from dev/icons/find.png
rename to img/find.png
diff --git a/dev/icons/folder_page.png b/img/folder_page.png
similarity index 100%
rename from dev/icons/folder_page.png
rename to img/folder_page.png
diff --git a/dev/icons/information.png b/img/information.png
similarity index 100%
rename from dev/icons/information.png
rename to img/information.png
diff --git a/dev/logos/logo32x32.png b/img/logo32x32.png
similarity index 100%
rename from dev/logos/logo32x32.png
rename to img/logo32x32.png
diff --git a/dev/logos/logo64x64.png b/img/logo64x64.png
similarity index 100%
rename from dev/logos/logo64x64.png
rename to img/logo64x64.png
diff --git a/dev/logos/logo9x9.png b/img/logo9x9.png
similarity index 100%
rename from dev/logos/logo9x9.png
rename to img/logo9x9.png
diff --git a/dev/icons/magifier_zoom_out.png b/img/magifier_zoom_out.png
similarity index 100%
rename from dev/icons/magifier_zoom_out.png
rename to img/magifier_zoom_out.png
diff --git a/dev/icons/magnifier.png b/img/magnifier.png
similarity index 100%
rename from dev/icons/magnifier.png
rename to img/magnifier.png
diff --git a/dev/icons/magnifier_zoom_in.png b/img/magnifier_zoom_in.png
similarity index 100%
rename from dev/icons/magnifier_zoom_in.png
rename to img/magnifier_zoom_in.png
diff --git a/dev/icons/page_copy.png b/img/page_copy.png
similarity index 100%
rename from dev/icons/page_copy.png
rename to img/page_copy.png
diff --git a/dev/icons/tick.png b/img/tick.png
similarity index 100%
rename from dev/icons/tick.png
rename to img/tick.png
diff --git a/dev/icons/world_go.png b/img/world_go.png
similarity index 100%
rename from dev/icons/world_go.png
rename to img/world_go.png
diff --git a/dev/icons/wrench.png b/img/wrench.png
similarity index 100%
rename from dev/icons/wrench.png
rename to img/wrench.png
diff --git a/languages/__init__.py b/lang/__init__.py
similarity index 100%
rename from languages/__init__.py
rename to lang/__init__.py
diff --git a/languages/japanese/__init__.py b/lang/japanese/__init__.py
similarity index 100%
rename from languages/japanese/__init__.py
rename to lang/japanese/__init__.py
diff --git a/languages/japanese/data/deinflect.dat b/lang/japanese/data/deinflect.dat
similarity index 100%
rename from languages/japanese/data/deinflect.dat
rename to lang/japanese/data/deinflect.dat
diff --git a/languages/japanese/data/dict-copyright.txt b/lang/japanese/data/dict-copyright.txt
similarity index 100%
rename from languages/japanese/data/dict-copyright.txt
rename to lang/japanese/data/dict-copyright.txt
diff --git a/languages/japanese/data/dict.sqlite b/lang/japanese/data/dict.sqlite
similarity index 100%
rename from languages/japanese/data/dict.sqlite
rename to lang/japanese/data/dict.sqlite
diff --git a/languages/japanese/data/kanji-copyright.txt b/lang/japanese/data/kanji-copyright.txt
similarity index 100%
rename from languages/japanese/data/kanji-copyright.txt
rename to lang/japanese/data/kanji-copyright.txt
diff --git a/languages/japanese/data/kanji.dat b/lang/japanese/data/kanji.dat
similarity index 100%
rename from languages/japanese/data/kanji.dat
rename to lang/japanese/data/kanji.dat
diff --git a/languages/japanese/data/radicals.dat b/lang/japanese/data/radicals.dat
similarity index 100%
rename from languages/japanese/data/radicals.dat
rename to lang/japanese/data/radicals.dat
diff --git a/languages/japanese/deinflect.py b/lang/japanese/deinflect.py
similarity index 100%
rename from languages/japanese/deinflect.py
rename to lang/japanese/deinflect.py
diff --git a/languages/japanese/dictionary.py b/lang/japanese/dictionary.py
similarity index 100%
rename from languages/japanese/dictionary.py
rename to lang/japanese/dictionary.py
diff --git a/languages/japanese/translate.py b/lang/japanese/translate.py
similarity index 100%
rename from languages/japanese/translate.py
rename to lang/japanese/translate.py
diff --git a/nodist b/nodist
index 1f7d5a8..c7e7b99 100644
--- a/nodist
+++ b/nodist
@@ -1,7 +1,5 @@
.git
.gitignore
-dev
-makefile
nodist
README
*.pyc
diff --git a/dev/about.ui b/ui/about.ui
similarity index 99%
rename from dev/about.ui
rename to ui/about.ui
index e21dc34..25a364f 100644
--- a/dev/about.ui
+++ b/ui/about.ui
@@ -22,7 +22,7 @@
- :/logos/logos/logo64x64.png
+ ../img/logo64x64.png
@@ -814,9 +814,7 @@ Public License instead of this License. But first, please read
-
-
-
+
buttonBox
diff --git a/dev/preferences.ui b/ui/preferences.ui
similarity index 99%
rename from dev/preferences.ui
rename to ui/preferences.ui
index a34a167..42b14e5 100644
--- a/dev/preferences.ui
+++ b/ui/preferences.ui
@@ -343,9 +343,7 @@
-
-
-
+
buttonBox
diff --git a/dev/reader.ui b/ui/reader.ui
similarity index 87%
rename from dev/reader.ui
rename to ui/reader.ui
index 4316ca3..42335ee 100644
--- a/dev/reader.ui
+++ b/ui/reader.ui
@@ -17,8 +17,8 @@
Yomichan
-
- :/logos/logos/logo32x32.png:/logos/logos/logo32x32.png
+
+ ../img/logo32x32.png../img/logo32x32.png
@@ -40,7 +40,7 @@
0
0
900
- 25
+ 23
-
- :/images/icons/folder_page.png:/images/icons/folder_page.png
+
+ ../img/folder_page.png../img/folder_page.png
&Open...
@@ -224,8 +224,8 @@
-
- :/images/icons/cross.png:/images/icons/cross.png
+
+ ../img/cross.png../img/cross.png
&Quit
@@ -242,8 +242,8 @@
-
- :/images/icons/wrench.png:/images/icons/wrench.png
+
+ ../img/wrench.png../img/wrench.png
&Preferences...
@@ -257,8 +257,8 @@
-
- :/images/icons/information.png:/images/icons/information.png
+
+ ../img/information.png../img/information.png
&About...
@@ -275,8 +275,8 @@
-
- :/images/icons/magnifier_zoom_in.png:/images/icons/magnifier_zoom_in.png
+
+ ../img/magnifier_zoom_in.png../img/magnifier_zoom_in.png
Zoom &in
@@ -290,8 +290,8 @@
-
- :/images/icons/magifier_zoom_out.png:/images/icons/magifier_zoom_out.png
+
+ ../img/magifier_zoom_out.png../img/magifier_zoom_out.png
Zoom &out
@@ -305,8 +305,8 @@
-
- :/images/icons/magnifier.png:/images/icons/magnifier.png
+
+ ../img/magnifier.png../img/magnifier.png
&Reset
@@ -323,8 +323,8 @@
-
- :/images/icons/find.png:/images/icons/find.png
+
+ ../img/find.png../img/find.png
&Find...
@@ -377,8 +377,8 @@
-
- :/images/icons/page_copy.png:/images/icons/page_copy.png
+
+ ../img/page_copy.png../img/page_copy.png
Copy &definition
@@ -397,8 +397,8 @@
-
- :/images/icons/world_go.png:/images/icons/world_go.png
+
+ ../img/world_go.png../img/world_go.png
&Homepage...
@@ -428,17 +428,15 @@
-
- :/images/icons/email.png:/images/icons/email.png
+
+ ../img/email.png../img/email.png
&Feedback...
-
-
-
+
actionToggleDefinitions
diff --git a/yomichan.pyw b/yomichan.pyw
index f5c8042..868f870 100755
--- a/yomichan.pyw
+++ b/yomichan.pyw
@@ -18,7 +18,7 @@
import sys
from PyQt4 import QtGui
-from languages import japanese
+from lang import japanese
from core.reader import MainWindowReader
diff --git a/yomichan_plugin.py b/yomichan_plugin.py
index d1e2849..315aed5 100644
--- a/yomichan_plugin.py
+++ b/yomichan_plugin.py
@@ -17,7 +17,7 @@
from PyQt4 import QtGui, QtCore
-from languages import japanese
+from lang import japanese
from core import anki_host
from core.preference_data import Preferences
from core.reader import MainWindowReader