diff --git a/debian/rules b/debian/rules
index 52570d4..0bab26b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,4 +7,4 @@ RUBYLIBDIR = $(shell ruby -rrbconfig -e "puts RbConfig::CONFIG['rubylibdir']")
 install/rbphoto::
 	mkdir -p $(DEB_DESTDIR)/$(RUBYLIBDIR)
 	install -m 755 bin/* $(DEB_DESTDIR)/usr/bin/
-	install -m 755 rbphoto.rb $(DEB_DESTDIR)/$(RUBYLIBDIR)
+	install -m 755 lib/rbphoto.rb $(DEB_DESTDIR)/$(RUBYLIBDIR)
diff --git a/rbphoto.rb b/lib/rbphoto.rb
similarity index 98%
rename from rbphoto.rb
rename to lib/rbphoto.rb
index 7719a57..4f23eb5 100755
--- a/rbphoto.rb
+++ b/lib/rbphoto.rb
@@ -21,8 +21,9 @@
 rhtml = {}
 
 class RbPhoto
-  NAME = "Robust Photo management tool"
-  VERSION = "0.1.5"
+  NAME = "RbPhoto"
+  LONGNAME = "Robust Photo management tool"
+  VERSION = "0.2.0"
 
   class Photo < String