* Prechod na novou verzi instalace pseudoautotools -> cmake

* Odstraneni bordelu kterej tu byl (pokud vam neco chybi brecte na me ja to zkusim najit v zaloze)
* TODO instalace: SEPSAT AUTORY, IKONKU VYROBIT



git-svn-id: http://opensvn.csie.org/tuxanci_ng@94 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

41 files changed, 246 insertions, 316 deletions

diff --git a/src/base/Makefile b/src/base/Makefile
deleted file mode 100644
index d9998a6..0000000
--- a/src/base/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-
-all: arena.o arenaFile.o director.o gun.o homeDirector.o checkFront.o idManager.o item.o index.o list.o main.o modules.o myTimer.o net_multiplayer.o protect.o proto.o server.o shot.o space.o storage.o textFile.o tux.o
-
-arena.o: arena.c arena.h
-	$(CC) $(CFLAGS) -o arena.o -c arena.c
-
-arenaFile.o: arenaFile.c arenaFile.h
-	$(CC) $(CFLAGS) -o arenaFile.o -c arenaFile.c
-
-director.o: director.c director.h
-	$(CC) $(CFLAGS) -o director.o -c director.c
-
-gun.o: gun.c gun.h
-	$(CC) $(CFLAGS) -o gun.o -c gun.c
-
-homeDirector.o: homeDirector.c homeDirector.h
-	$(CC) $(CFLAGS) -o homeDirector.o -c homeDirector.c
-
-checkFront.o: checkFront.c checkFront.h
-	$(CC) $(CFLAGS) -o checkFront.o -c checkFront.c
-
-idManager.o: idManager.c idManager.h
-	$(CC) $(CFLAGS) -o idManager.o -c idManager.c
-
-item.o: item.c item.h
-	$(CC) $(CFLAGS) -o item.o -c item.c
-
-index.o: index.c index.h
-	$(CC) $(CFLAGS) -o index.o -c index.c
-
-list.o: list.c list.h
-	$(CC) $(CFLAGS) -o list.o -c list.c
-
-main.o: main.c main.h
-	$(CC) $(CFLAGS) -o main.o -c main.c
-
-modules.o: modules.c modules.h
-	$(CC) $(CFLAGS) -o modules.o -c modules.c
-
-myTimer.o: myTimer.c myTimer.h
-	$(CC) $(CFLAGS) -o myTimer.o -c myTimer.c
-
-net_multiplayer.o: net_multiplayer.c net_multiplayer.h
-	$(CC) $(CFLAGS) -o net_multiplayer.o -c net_multiplayer.c
-
-protect.o: protect.c protect.h
-	$(CC) $(CFLAGS) -o protect.o -c protect.c
-
-server.o: server.c server.h
-	$(CC) $(CFLAGS) -o server.o -c server.c
-
-shot.o: shot.c shot.h
-	$(CC) $(CFLAGS) -o shot.o -c shot.c
-
-space.o: space.c space.h
-	$(CC) $(CFLAGS) -o space.o -c space.c
-
-storage.o: storage.c storage.h
-	$(CC) $(CFLAGS) -o storage.o -c storage.c
-
-textFile.o: textFile.c textFile.h
-	$(CC) $(CFLAGS) -o textFile.o -c textFile.c
-
-tux.o: tux.c tux.h
-	$(CC) $(CFLAGS) -o tux.o -c tux.c
-
-clean:
-	rm -rf *.o
-
-
diff --git a/src/base/arena.c b/src/base/arena.c
index 9de1dce..7358e41 100644
--- a/src/base/arena.c
+++ b/src/base/arena.c
@@ -3,18 +3,18 @@
 #include <assert.h>
 #include <string.h>
 
-#include "base/main.h"
-#include "base/arena.h"
-#include "base/list.h"
-#include "base/tux.h"
-#include "base/shot.h"
-#include "base/item.h"
-#include "base/myTimer.h"
-#include "base/modules.h"
+#include "main.h"
+#include "arena.h"
+#include "list.h"
+#include "tux.h"
+#include "shot.h"
+#include "item.h"
+#include "myTimer.h"
+#include "modules.h"
 
 #ifndef PUBLIC_SERVER
-#include "screen/screen_world.h"
-#include "client/layer.h"
+#include "screen_world.h"
+#include "layer.h"
 #endif
 
 static arena_t *currentArena;
diff --git a/src/base/arena.h b/src/base/arena.h
index 57792c5..837fade 100644
--- a/src/base/arena.h
+++ b/src/base/arena.h
@@ -3,14 +3,14 @@
 
 #define ARENA_H
 
-#include "base/main.h"
+#include "main.h"
 
 #ifndef PUBLIC_SERVER
-#include "client/interface.h"
+#include "interface.h"
 #endif
 
-#include "base/list.h"
-#include "base/space.h"
+#include "list.h"
+#include "space.h"
 
 typedef struct arena_struct
 {
diff --git a/src/base/arenaFile.c b/src/base/arenaFile.c
index 9fe683e..f0de21f 100644
--- a/src/base/arenaFile.c
+++ b/src/base/arenaFile.c
@@ -4,21 +4,21 @@
 #include <string.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/textFile.h"
-#include "base/arenaFile.h"
-#include "base/arena.h"
-#include "base/tux.h"
-#include "base/shot.h"
-#include "base/item.h"
-#include "base/director.h"
-#include "base/modules.h"
+#include "main.h"
+#include "list.h"
+#include "textFile.h"
+#include "arenaFile.h"
+#include "arena.h"
+#include "tux.h"
+#include "shot.h"
+#include "item.h"
+#include "director.h"
+#include "modules.h"
 
 #ifndef PUBLIC_SERVER
-#include "client/configFile.h"
-#include "client/image.h"
-#include "audio/music.h"
+#include "configFile.h"
+#include "image.h"
+#include "music.h"
 #endif
 
 static list_t *listArenaFile;
diff --git a/src/base/arenaFile.h b/src/base/arenaFile.h
index e2e8108..5f71f5b 100644
--- a/src/base/arenaFile.h
+++ b/src/base/arenaFile.h
@@ -3,8 +3,8 @@
 
 #define ARENA_FILE_H
 
-#include "base/main.h"
-#include "base/arena.h"
+#include "main.h"
+#include "arena.h"
 
 #define PUBLIC_SERVER_PATH_ARENA "./arena/"
 
diff --git a/src/base/checkFront.c b/src/base/checkFront.c
index 37b0ace..f6164f3 100644
--- a/src/base/checkFront.c
+++ b/src/base/checkFront.c
@@ -4,12 +4,12 @@
 #include <string.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/myTimer.h"
-#include "base/checkFront.h"
-#include "base/idManager.h"
-#include "base/server.h"
+#include "main.h"
+#include "list.h"
+#include "myTimer.h"
+#include "checkFront.h"
+#include "idManager.h"
+#include "server.h"
 
 typedef struct struct_checkfront_t
 {
diff --git a/src/base/checkFront.h b/src/base/checkFront.h
index 3beb370..dde30f0 100644
--- a/src/base/checkFront.h
+++ b/src/base/checkFront.h
@@ -3,8 +3,8 @@
 
 #define CHECK_FRONT_H
 
-#include "base/list.h"
-#include "base/server.h"
+#include "list.h"
+#include "server.h"
 
 #define CHECK_FRONT_SEND_TIME_INTERVAL	100
 #define CHECK_FRONT_MAX_COUNT_SEND	30
diff --git a/src/base/director.c b/src/base/director.c
index fede2c3..0cece6b 100755
--- a/src/base/director.c
+++ b/src/base/director.c
@@ -7,8 +7,8 @@
 #include <unistd.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/list.h"
+#include "main.h"
+#include "list.h"
 
 typedef struct director_struct
 {
diff --git a/src/base/director.h b/src/base/director.h
index 20e577c..8a07ed0 100644
--- a/src/base/director.h
+++ b/src/base/director.h
@@ -3,8 +3,8 @@
 
 #define DIRECTOR_H
 
-#include "base/main.h"
-#include "base/list.h"
+#include "main.h"
+#include "list.h"
 
 typedef struct director_struct
 {
diff --git a/src/base/gun.c b/src/base/gun.c
index c59bd98..f905efd 100644
--- a/src/base/gun.c
+++ b/src/base/gun.c
@@ -3,29 +3,29 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/arena.h"
-#include "base/tux.h"
-#include "base/shot.h"
-#include "base/myTimer.h"
-#include "base/item.h"
-#include "base/gun.h"
-#include "base/proto.h"
-#include "base/net_multiplayer.h"
+#include "main.h"
+#include "arena.h"
+#include "tux.h"
+#include "shot.h"
+#include "myTimer.h"
+#include "item.h"
+#include "gun.h"
+#include "proto.h"
+#include "net_multiplayer.h"
 
 #ifndef NO_SOUND
-#include "audio/sound.h"
+#include "sound.h"
 #endif
 
 #ifndef PUBLIC_SERVER
-#include "client/interface.h"
-#include "client/term.h"
+#include "interface.h"
+#include "term.h"
 
-#include "screen/screen_world.h"
+#include "screen_world.h"
 #endif
 
 #ifdef PUBLIC_SERVER
-#include "server/publicServer.h"
+#include "publicServer.h"
 #endif
 
 static void modificiationCopuse(int courser, int right_x, int right_y, int *dest_x, int *dest_y)
diff --git a/src/base/homeDirector.c b/src/base/homeDirector.c
index 0533d2e..e78ffa4 100755
--- a/src/base/homeDirector.c
+++ b/src/base/homeDirector.c
@@ -5,8 +5,8 @@
 #include <assert.h>
 #include <sys/stat.h>
 
-#include "base/main.h"
-#include "base/homeDirector.h"
+#include "main.h"
+#include "homeDirector.h"
 
 static char homeDirector[STR_PATH_SIZE];
 
diff --git a/src/base/homeDirector.h b/src/base/homeDirector.h
index a5c5e0c..85f8172 100755
--- a/src/base/homeDirector.h
+++ b/src/base/homeDirector.h
@@ -3,7 +3,7 @@
 
 #define HOMEDIRECTOR_H
 
-#include "base/main.h"
+#include "main.h"
 
 #define HOMEDIRECTOR_NAME ".tuxanci-ng"
 
diff --git a/src/base/idManager.c b/src/base/idManager.c
index fb4a928..ea7e679 100644
--- a/src/base/idManager.c
+++ b/src/base/idManager.c
@@ -3,9 +3,9 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/idManager.h"
+#include "main.h"
+#include "list.h"
+#include "idManager.h"
 
 static list_t *listID;
 static int lastID;
diff --git a/src/base/idManager.h b/src/base/idManager.h
index 2b33ac5..62e2651 100644
--- a/src/base/idManager.h
+++ b/src/base/idManager.h
@@ -7,7 +7,7 @@
 #define MAX_ID		1000
 #define ID_UNKNOWN	-1
 
-#include "base/list.h"
+#include "list.h"
 
 extern void initListID();
 extern int getNewID();
diff --git a/src/base/item.c b/src/base/item.c
index 73bfeaa..7f12ce7 100644
--- a/src/base/item.c
+++ b/src/base/item.c
@@ -2,33 +2,33 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/arena.h"
-#include "base/tux.h"
-#include "base/item.h"
-#include "base/shot.h"
-#include "base/proto.h"
-#include "base/idManager.h"
-#include "base/net_multiplayer.h"
+#include "main.h"
+#include "arena.h"
+#include "tux.h"
+#include "item.h"
+#include "shot.h"
+#include "proto.h"
+#include "idManager.h"
+#include "net_multiplayer.h"
 
 #ifndef PUBLIC_SERVER
 
-#include "client/interface.h"
-#include "client/image.h"
-#include "client/layer.h"
-#include "client/term.h"
+#include "interface.h"
+#include "image.h"
+#include "layer.h"
+#include "term.h"
 
-#include "screen/screen_world.h"
-#include "screen/screen_setting.h"
+#include "screen_world.h"
+#include "screen_setting.h"
 
 #ifndef NO_SOUND
-#include "audio/sound.h"
+#include "sound.h"
 #endif
 
 #endif
 
 #ifdef PUBLIC_SERVER
-#include "server/publicServer.h"
+#include "publicServer.h"
 #endif
 
 #ifndef PUBLIC_SERVER	
diff --git a/src/base/item.h b/src/base/item.h
index ec11654..c23e7d7 100644
--- a/src/base/item.h
+++ b/src/base/item.h
@@ -3,17 +3,17 @@
 
 #define ITEM_H
 
-#include "base/main.h"
+#include "main.h"
 
 #define ITEM_SYNC_TIMEOUT	5000
 
 #ifndef PUBLIC_SERVER
-#include "client/interface.h"
+#include "interface.h"
 #endif
 
-#include "base/list.h"
-#include "base/tux.h"
-#include "base/myTimer.h"
+#include "list.h"
+#include "tux.h"
+#include "myTimer.h"
 
 typedef struct item_struct
 {
diff --git a/src/base/list.c b/src/base/list.c
index d182210..27b0ed8 100755
--- a/src/base/list.c
+++ b/src/base/list.c
@@ -1,6 +1,6 @@
 
-#include "base/main.h"
-#include "base/list.h"
+#include "main.h"
+#include "list.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/base/list.h b/src/base/list.h
index 17a8e2d..5a15786 100755
--- a/src/base/list.h
+++ b/src/base/list.h
@@ -3,7 +3,7 @@
 
 #define LIST_H
 
-#include "base/main.h"
+#include "main.h"
 
 #define LIST_ALLOC_LIMIT 16
 
diff --git a/src/base/main.c b/src/base/main.c
index ffebbe0..5fb3d4e 100644
--- a/src/base/main.c
+++ b/src/base/main.c
@@ -8,15 +8,15 @@
 #include <assert.h>
 #include <sys/stat.h>
 
-#include "base/main.h"
-#include "base/tux.h"
+#include "main.h"
+#include "tux.h"
 
 #ifndef PUBLIC_SERVER
-#include "client/game.h"
+#include "game.h"
 #endif
 
 #ifdef PUBLIC_SERVER
-#include "server/publicServer.h"
+#include "publicServer.h"
 #endif
 
 static int my_argc;
diff --git a/src/base/main.h b/src/base/main.h
index b38a1d7..fcf1f4d 100644
--- a/src/base/main.h
+++ b/src/base/main.h
@@ -11,15 +11,15 @@
 
 #endif
 
-#include "base/bool.h"
-#include "base/string_length.h"
-#include "base/path.h"
+#include "bool.h"
+#include "string_length.h"
+#include "path.h"
 
 //rozlisenie obrazovky
 #define WINDOW_SIZE_X 800
 #define WINDOW_SIZE_Y 600
 
-#include "base/list.h"
+#include "list.h"
 
 extern list_t *listHelp;
 
diff --git a/src/base/modules.c b/src/base/modules.c
index aa881d5..108990f 100755
--- a/src/base/modules.c
+++ b/src/base/modules.c
@@ -5,20 +5,20 @@
 #include <dlfcn.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/tux.h"
-#include "base/shot.h"
-#include "base/modules.h"
-#include "base/arena.h"
-#include "base/arenaFile.h"
-#include "base/proto.h"
+#include "main.h"
+#include "list.h"
+#include "tux.h"
+#include "shot.h"
+#include "modules.h"
+#include "arena.h"
+#include "arenaFile.h"
+#include "proto.h"
 
 #ifndef PUBLIC_SERVER
-#include "client/interface.h"
-#include "client/image.h"
-#include "client/layer.h"
-#include "client/configFile.h"
+#include "interface.h"
+#include "image.h"
+#include "layer.h"
+#include "configFile.h"
 #endif
 
 int pokus(char *s)
diff --git a/src/base/modules.h b/src/base/modules.h
index 3b50ade..0b31292 100644
--- a/src/base/modules.h
+++ b/src/base/modules.h
@@ -3,14 +3,14 @@
 
 #define MODULE_H
 
-#include "base/tux.h"
-#include "base/shot.h"
-#include "base/arena.h"
-#include "base/proto.h"
-#include "base/myTimer.h"
+#include "tux.h"
+#include "shot.h"
+#include "arena.h"
+#include "proto.h"
+#include "myTimer.h"
 
 #ifndef PUBLIC_SERVER
-#include "client/image.h"
+#include "image.h"
 #endif
 
 typedef struct export_fce_s
diff --git a/src/base/myTimer.c b/src/base/myTimer.c
index 7913f8b..5e74207 100644
--- a/src/base/myTimer.c
+++ b/src/base/myTimer.c
@@ -6,12 +6,12 @@
 #include <sys/time.h>
 #include <signal.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/myTimer.h"
+#include "main.h"
+#include "list.h"
+#include "myTimer.h"
 
 #ifndef PUBLIC_SERVER
-#include "client/interface.h"
+#include "interface.h"
 #endif
 
 static struct timeval start = { .tv_sec = 0, .tv_usec = 0 };
diff --git a/src/base/myTimer.h b/src/base/myTimer.h
index 2f038da..97c2f65 100644
--- a/src/base/myTimer.h
+++ b/src/base/myTimer.h
@@ -3,8 +3,8 @@
 
 #define MY_TIME_H
 
-#include "base/main.h"
-#include "base/list.h"
+#include "main.h"
+#include "list.h"
 
 #define my_time_t unsigned int
 
diff --git a/src/base/net_multiplayer.c b/src/base/net_multiplayer.c
index bc8ecab..b028e0f 100644
--- a/src/base/net_multiplayer.c
+++ b/src/base/net_multiplayer.c
@@ -4,28 +4,28 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/tux.h"
-#include "base/item.h"
-#include "base/arenaFile.h"
-#include "base/net_multiplayer.h"
-#include "base/server.h"
+#include "main.h"
+#include "list.h"
+#include "tux.h"
+#include "item.h"
+#include "arenaFile.h"
+#include "net_multiplayer.h"
+#include "server.h"
 
 #ifdef SUPPORT_NET_UNIX_UDP
-#include "net_unix/udp.h"
+#include "udp.h"
 #endif
 
 #ifdef SUPPORT_NET_SDL_UDP
-#include "net_sdl/sdl_udp.h"
+#include "sdl_udp.h"
 #endif
 
 #ifndef PUBLIC_SERVER
-#include "screen/screen_setting.h"
-#include "screen/screen_choiceArena.h"
+#include "screen_setting.h"
+#include "screen_choiceArena.h"
 
-#include "client/screen.h"
-#include "client/client.h"
+#include "screen.h"
+#include "client.h"
 #endif
 
 static int netGameType;
diff --git a/src/base/net_multiplayer.h b/src/base/net_multiplayer.h
index a37df6f..3137385 100644
--- a/src/base/net_multiplayer.h
+++ b/src/base/net_multiplayer.h
@@ -3,10 +3,10 @@
 
 #define NET_MULTIPLAYER_H
 
-#include "base/main.h"
-#include "base/tux.h"
-#include "base/item.h"
-#include "base/arena.h"
+#include "main.h"
+#include "tux.h"
+#include "item.h"
+#include "arena.h"
 
 #define PROTO_UDPv4	0
 #define PROTO_UDPv6	1
diff --git a/src/base/path.h b/src/base/path.h
index 9c26ea4..a99bf83 100644
--- a/src/base/path.h
+++ b/src/base/path.h
@@ -3,7 +3,7 @@
 
 #define PATH_H
 
-#include "base/main.h"
+#include "main.h"
 
 #ifdef DESTDIR
 
@@ -27,7 +27,7 @@
 #define PATH_MUSIC	DESTDIR PATH_DIR "music/"
 #define PATH_CONFIG	DESTDIR PATH_DIR "conf/"
 #define PATH_LANG	DESTDIR PATH_DIR "lang/"
-#define PATH_DATA	DESTDIR PATH_DIR "data/"
-#define PATH_MODULES	DESTDIR PATH_DIR "modules/"
+#define PATH_DATA	DESTDIR PATH_DIR "doc/"
+#define PATH_MODULES DESTDIR "lib/tuxanci-ng/"
 
 #endif 
diff --git a/src/base/protect.c b/src/base/protect.c
index 7da70bb..cf567b8 100644
--- a/src/base/protect.c
+++ b/src/base/protect.c
@@ -4,9 +4,9 @@
 #include <string.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/myTimer.h"
-#include "base/protect.h"
+#include "main.h"
+#include "myTimer.h"
+#include "protect.h"
 
 protect_t* newProtect()
 {
diff --git a/src/base/protect.h b/src/base/protect.h
index b0db5a9..e0553dd 100644
--- a/src/base/protect.h
+++ b/src/base/protect.h
@@ -3,8 +3,8 @@
 
 #define PROTECT_H
 
-#include "base/main.h"
-#include "base/myTimer.h"
+#include "main.h"
+#include "myTimer.h"
 
 #define PROTECT_PING_INTERVAL_TIMEOUT	5000
 #define PROTECT_SPEED_INTERVAL_TIMEOUT	40
diff --git a/src/base/proto.c b/src/base/proto.c
index cc33149..722d443 100644
--- a/src/base/proto.c
+++ b/src/base/proto.c
@@ -4,35 +4,35 @@
 #include <string.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/tux.h"
-#include "base/item.h"
-#include "base/shot.h"
-#include "base/arenaFile.h"
-#include "base/myTimer.h"
-#include "base/server.h"
-#include "base/proto.h"
-#include "base/net_multiplayer.h"
-#include "base/checkFront.h"
-#include "base/idManager.h"
-#include "base/protect.h"
+#include "main.h"
+#include "list.h"
+#include "tux.h"
+#include "item.h"
+#include "shot.h"
+#include "arenaFile.h"
+#include "myTimer.h"
+#include "server.h"
+#include "proto.h"
+#include "net_multiplayer.h"
+#include "checkFront.h"
+#include "idManager.h"
+#include "protect.h"
 
 #ifndef PUBLIC_SERVER
-#include "client/language.h"
-#include "screen/screen_world.h"
-#include "screen/screen_setting.h"
-#include "screen/screen_choiceArena.h"
-#include "screen/screen_analyze.h"
-#include "client/client.h"
-#include "client/term.h"
-#include "client/radar.h"
+#include "language.h"
+#include "screen_world.h"
+#include "screen_setting.h"
+#include "screen_choiceArena.h"
+#include "screen_analyze.h"
+#include "client.h"
+#include "term.h"
+#include "radar.h"
 #endif
 
 #ifdef PUBLIC_SERVER
-#include "server/heightScore.h"
-#include "server/publicServer.h"
-#include "server/serverConfigFile.h"
+#include "heightScore.h"
+#include "publicServer.h"
+#include "serverConfigFile.h"
 #endif
 
 void proto_send_error_server(int type, client_t *client, int errorcode)
diff --git a/src/base/proto.h b/src/base/proto.h
index 9fe9303..116562b 100644
--- a/src/base/proto.h
+++ b/src/base/proto.h
@@ -8,25 +8,25 @@
 #include <string.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/item.h"
-#include "base/shot.h"
-#include "base/arenaFile.h"
-#include "base/myTimer.h"
-#include "base/server.h"
-#include "base/proto.h"
-#include "base/net_multiplayer.h"
+#include "main.h"
+#include "list.h"
+#include "item.h"
+#include "shot.h"
+#include "arenaFile.h"
+#include "myTimer.h"
+#include "server.h"
+#include "proto.h"
+#include "net_multiplayer.h"
 
 #ifndef PUBLIC_SERVER
-#include "screen/screen_world.h"
-#include "screen/screen_setting.h"
-#include "screen/screen_choiceArena.h"
-#include "client/client.h"
+#include "screen_world.h"
+#include "screen_setting.h"
+#include "screen_choiceArena.h"
+#include "client.h"
 #endif
 
 #ifdef PUBLIC_SERVER
-#include "server/publicServer.h"
+#include "publicServer.h"
 #endif
 
 #define PROTO_SEND_ONE			0
diff --git a/src/base/server.c b/src/base/server.c
index 941b62e..9132a46 100644
--- a/src/base/server.c
+++ b/src/base/server.c
@@ -12,28 +12,28 @@
 #include <sys/ioctl.h>
 #include <sys/time.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/tux.h"
-#include "base/proto.h"
-#include "base/server.h"
-#include "base/myTimer.h"
-#include "base/arena.h"
-#include "base/net_multiplayer.h"
-#include "base/checkFront.h"
-#include "base/protect.h"
-#include "base/index.h"
+#include "main.h"
+#include "list.h"
+#include "tux.h"
+#include "proto.h"
+#include "server.h"
+#include "myTimer.h"
+#include "arena.h"
+#include "net_multiplayer.h"
+#include "checkFront.h"
+#include "protect.h"
+#include "index.h"
 
 #ifndef PUBLIC_SERVER
-#include "screen/screen_world.h"
+#include "screen_world.h"
 #endif
 
 #ifdef PUBLIC_SERVER
-#include "server/publicServer.h"
-#include "server/heightScore.h"
+#include "publicServer.h"
+#include "heightScore.h"
 #endif
 
-#include "net_unix/udp.h"
+#include "udp.h"
 
 static sock_udp_t *sock_server_udp;
 static sock_udp_t *sock_server_udp_second;
diff --git a/src/base/server.h b/src/base/server.h
index 670258c..e6f0b93 100644
--- a/src/base/server.h
+++ b/src/base/server.h
@@ -5,25 +5,25 @@
 
 #include <time.h>
 
-#include "base/list.h"
-#include "base/tux.h"
-#include "base/myTimer.h"
-#include "base/protect.h"
+#include "list.h"
+#include "tux.h"
+#include "myTimer.h"
+#include "protect.h"
 
 #ifndef PUBLIC_SERVER
-#include "client/interface.h"
+#include "interface.h"
 #endif
 
 
 #ifdef SUPPORT_NET_SDL_UDP
 
-#include "net_sdl/sdl_udp.h"
+#include "sdl_udp.h"
 
 #endif
 
 #ifdef SUPPORT_NET_UNIX_UDP
 
-#include "net_unix/udp.h"
+#include "udp.h"
 
 #endif
 
diff --git a/src/base/shot.c b/src/base/shot.c
index 96f5692..826bad4 100644
--- a/src/base/shot.c
+++ b/src/base/shot.c
@@ -3,21 +3,21 @@
 #include <string.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/shot.h"
-#include "base/gun.h"
-#include "base/net_multiplayer.h"
-#include "base/proto.h"
-#include "base/idManager.h"
+#include "main.h"
+#include "shot.h"
+#include "gun.h"
+#include "net_multiplayer.h"
+#include "proto.h"
+#include "idManager.h"
 
 #ifndef PUBLIC_SERVER
-#include "client/image.h"
-#include "client/layer.h"
-#include "screen/screen_world.h"
+#include "image.h"
+#include "layer.h"
+#include "screen_world.h"
 #endif
 
 #ifdef PUBLIC_SERVER
-#include "server/publicServer.h"
+#include "publicServer.h"
 #endif
 
 #ifndef PUBLIC_SERVER
diff --git a/src/base/shot.h b/src/base/shot.h
index db157cb..06e1bba 100644
--- a/src/base/shot.h
+++ b/src/base/shot.h
@@ -3,13 +3,13 @@
 
 #define SHOT_H
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/tux.h"
-#include "base/arena.h"
+#include "main.h"
+#include "list.h"
+#include "tux.h"
+#include "arena.h"
 
 #ifndef PUBLIC_SERVER	
-#include "client/interface.h"
+#include "interface.h"
 #endif	
 
 typedef struct shot_struct
diff --git a/src/base/storage.h b/src/base/storage.h
index af72ba2..81e554e 100644
--- a/src/base/storage.h
+++ b/src/base/storage.h
@@ -3,8 +3,8 @@
 
 #define STORAGE_H
 
-#include "base/main.h"
-#include "base/list.h"
+#include "main.h"
+#include "list.h"
 
 extern list_t* newStorage();
 extern void addItemToStorage(list_t *list, char *group, char *name, void *data);
diff --git a/src/base/string_length.h b/src/base/string_length.h
index c453e60..b1712ee 100644
--- a/src/base/string_length.h
+++ b/src/base/string_length.h
@@ -3,7 +3,7 @@
 
 #define STR_LENGTH_H
 
-#include "base/main.h"
+#include "main.h"
 
 #define STR_SIZE		128
 #define STR_PROTO_SIZE		128
diff --git a/src/base/textFile.c b/src/base/textFile.c
index 5c8c95d..d143601 100755
--- a/src/base/textFile.c
+++ b/src/base/textFile.c
@@ -6,8 +6,8 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include "base/main.h"
-#include "base/textFile.h"
+#include "main.h"
+#include "textFile.h"
 
 textFile_t* newTextFile(char *s)
 {
diff --git a/src/base/textFile.h b/src/base/textFile.h
index ea15b4d..3917db7 100755
--- a/src/base/textFile.h
+++ b/src/base/textFile.h
@@ -3,7 +3,7 @@
 
 #define TEXTFILE_H
 
-#include "base/list.h"
+#include "list.h"
 
 typedef struct str_textFile_t
 {
diff --git a/src/base/tux.c b/src/base/tux.c
index 7992bd9..84bc87d 100644
--- a/src/base/tux.c
+++ b/src/base/tux.c
@@ -4,32 +4,32 @@
 #include <string.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/tux.h"
-#include "base/arena.h"
-#include "base/shot.h"
-#include "base/gun.h"
-#include "base/item.h"
-#include "base/arena.h"
-#include "base/myTimer.h"
-#include "base/net_multiplayer.h"
-#include "base/proto.h"
-#include "base/modules.h"
-#include "base/idManager.h"
+#include "main.h"
+#include "tux.h"
+#include "arena.h"
+#include "shot.h"
+#include "gun.h"
+#include "item.h"
+#include "arena.h"
+#include "myTimer.h"
+#include "net_multiplayer.h"
+#include "proto.h"
+#include "modules.h"
+#include "idManager.h"
 
 #ifndef PUBLIC_SERVER
-#include "client/image.h"
-#include "client/layer.h"
-#include "client/term.h"
-#include "client/radar.h"
+#include "image.h"
+#include "layer.h"
+#include "term.h"
+#include "radar.h"
 
-#include "audio/sound.h"
+#include "sound.h"
 
-#include "screen/screen_world.h"
+#include "screen_world.h"
 #endif
 
 #ifdef PUBLIC_SERVER
-#include "server/publicServer.h"
+#include "publicServer.h"
 #endif
 
 #ifndef PUBLIC_SERVER
diff --git a/src/base/tux.h b/src/base/tux.h
index c8f6e51..4908af7 100644
--- a/src/base/tux.h
+++ b/src/base/tux.h
@@ -3,9 +3,9 @@
 
 #define TUX_H
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/arena.h"
+#include "main.h"
+#include "list.h"
+#include "arena.h"
 
 #define TUX_STEP 7
 #define TUX_LAYER 0