diff --git a/wmsun/wmSun/Makefile b/wmsun/Makefile
similarity index 93%
rename from wmsun/wmSun/Makefile
rename to wmsun/Makefile
index 907b2b4..a3709cf 100644
--- a/wmsun/wmSun/Makefile
+++ b/wmsun/Makefile
@@ -18,7 +18,7 @@ LIBS   = -lXpm -lX11 -lXext
 # LIBS   = -lXpm -lX11 -lXext -lsocket
 
 
-OBJS   = wmSun.o SunRise.o ../wmgeneral/wmgeneral.o
+OBJS   = wmSun.o SunRise.o wmgeneral/wmgeneral.o
 
 
 .c.o:
diff --git a/wmsun/wmSun/README b/wmsun/README
similarity index 100%
rename from wmsun/wmSun/README
rename to wmsun/README
diff --git a/wmsun/wmSun/SunRise.c b/wmsun/SunRise.c
similarity index 100%
rename from wmsun/wmSun/SunRise.c
rename to wmsun/SunRise.c
diff --git a/wmsun/wmSun/wmSun.1 b/wmsun/wmSun.1
similarity index 100%
rename from wmsun/wmSun/wmSun.1
rename to wmsun/wmSun.1
diff --git a/wmsun/wmSun/wmSun.c b/wmsun/wmSun.c
similarity index 99%
rename from wmsun/wmSun/wmSun.c
rename to wmsun/wmSun.c
index d2e33ce..70ad18c 100644
--- a/wmsun/wmSun/wmSun.c
+++ b/wmsun/wmSun.c
@@ -77,7 +77,7 @@
 #include <time.h>
 #include <X11/X.h>
 #include <X11/xpm.h>
-#include "../wmgeneral/wmgeneral.h"
+#include "wmgeneral/wmgeneral.h"
 #include "wmSun_master.xpm"
 #include "wmSun_mask.xbm"
 
diff --git a/wmsun/wmSun/wmSun_mask.xbm b/wmsun/wmSun_mask.xbm
similarity index 100%
rename from wmsun/wmSun/wmSun_mask.xbm
rename to wmsun/wmSun_mask.xbm
diff --git a/wmsun/wmSun/wmSun_master.xpm b/wmsun/wmSun_master.xpm
similarity index 100%
rename from wmsun/wmSun/wmSun_master.xpm
rename to wmsun/wmSun_master.xpm