diff --git a/wmtemp/Makefile b/Makefile
similarity index 87%
rename from wmtemp/Makefile
rename to Makefile
index 4e77851..800e732 100644
--- a/wmtemp/Makefile
+++ b/Makefile
@@ -1,9 +1,8 @@
 # By RedSeb 1999, Liverbugg 2002
 
+SRC = src/wmtemp.c
 
-SRC = wmtemp.c
-
-EXE = wmtemp
+EXE = src/wmtemp
 
 OBJ = $(SRC:.c=.o)
 
@@ -23,11 +22,11 @@ $(OBJ): %.o : %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 clean:
-	rm -rf $(EXE)
-	rm -rf *.o
+	rm -rf $(EXE) src/*.o
 
 install:
 	$(INSTALL) $(EXE) /usr/local/bin/
+
 uninstall:
 	rm -rf /usr/local/bin/$(EXE)
 
diff --git a/README.rst b/README.rst
index 4159b1d..c7ef87b 100644
--- a/README.rst
+++ b/README.rst
@@ -10,12 +10,11 @@ Based on WMTempMon dockapp, although it was heavily reworked.
 Compile
 -------
 
-To build the dockapp, you'll need `libdockap`_ it should be available in your
+To build the dockapp, you'll need `libdockapp`_ it should be available in your
 package repository. While you have it installed, perform the commands:
 
 .. code:: shell-session
 
-   $ cd wmtemp
    $ make
    $ sudo make install
 
diff --git a/wmtemp/standards.h b/src/standards.h
similarity index 100%
rename from wmtemp/standards.h
rename to src/standards.h
diff --git a/wmtemp/wmtemp.c b/src/wmtemp.c
similarity index 99%
rename from wmtemp/wmtemp.c
rename to src/wmtemp.c
index 58ca8b4..1d68f4e 100644
--- a/wmtemp/wmtemp.c
+++ b/src/wmtemp.c
@@ -3,7 +3,7 @@
  * based on wmsensormon and other simple dockapps, although it doesn't use 
  * lmsensors, just provided information from kernel via /sys filesystem.
  *
- * version = 0.5
+ * version = 0.7
  *
  * licence: GPL2
  */
diff --git a/wmtemp/wmtemp_mask.xbm b/src/wmtemp_mask.xbm
similarity index 100%
rename from wmtemp/wmtemp_mask.xbm
rename to src/wmtemp_mask.xbm
diff --git a/wmtemp/wmtemp_master.xpm b/src/wmtemp_master.xpm
similarity index 100%
rename from wmtemp/wmtemp_master.xpm
rename to src/wmtemp_master.xpm