diff --git a/ebin/egs.app b/ebin/egs.app
index b3053ff..d68775a 100644
--- a/ebin/egs.app
+++ b/ebin/egs.app
@@ -9,7 +9,7 @@
 		reloader,
 		egs_cron,
 		egs_db,
-		egs_game,
+		psu_game,
 		psu_login,
 		psu_patch,
 		egs_proto,
diff --git a/src/egs_sup.erl b/src/egs_sup.erl
index cd031f5..a91ca71 100644
--- a/src/egs_sup.erl
+++ b/src/egs_sup.erl
@@ -50,7 +50,7 @@ upgrade() ->
 init([]) ->
 	%% Start egs_cron, egs_game, egs_login, egs_patch. To be replaced by configurable modules.
 	Processes = [{egs_cron, {egs_cron, start, []}, permanent, 5000, worker, dynamic},
-				 {egs_game, {egs_game, start, []}, permanent, 5000, worker, dynamic},
+				 {psu_game, {psu_game, start_link, [?GAME_PORT]}, permanent, 5000, worker, dynamic},
 				 {psu_login_jp1, {psu_login, start_link, [?LOGIN_PORT_JP_ONE, 10000001]}, permanent, 5000, worker, dynamic},
 				 {psu_login_jp2, {psu_login, start_link, [?LOGIN_PORT_JP_TWO, 20000001]}, permanent, 5000, worker, dynamic},
 				 {psu_login_us, {psu_login, start_link, [?LOGIN_PORT_US, 30000001]}, permanent, 5000, worker, dynamic},
diff --git a/src/egs_game.erl b/src/psu/psu_game.erl
similarity index 97%
rename from src/egs_game.erl
rename to src/psu/psu_game.erl
index 506be8a..49dd81b 100644
--- a/src/egs_game.erl
+++ b/src/psu/psu_game.erl
@@ -1,34 +1,36 @@
-%	EGS: Erlang Game Server
-%	Copyright (C) 2010  Loic Hoguin
-%
-%	This file is part of EGS.
-%
-%	EGS is free software: you can redistribute it and/or modify
-%	it under the terms of the GNU General Public License as published by
-%	the Free Software Foundation, either version 3 of the License, or
-%	(at your option) any later version.
-%
-%	EGS is distributed in the hope that it will be useful,
-%	but WITHOUT ANY WARRANTY; without even the implied warranty of
-%	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%	GNU General Public License for more details.
-%
-%	You should have received a copy of the GNU General Public License
-%	along with EGS.  If not, see <http://www.gnu.org/licenses/>.
+%% @author Loïc Hoguin <essen@dev-extend.eu>
+%% @copyright 2010 Loïc Hoguin.
+%% @doc Handle game clients.
+%%
+%%	This file is part of EGS.
+%%
+%%	EGS is free software: you can redistribute it and/or modify
+%%	it under the terms of the GNU General Public License as published by
+%%	the Free Software Foundation, either version 3 of the License, or
+%%	(at your option) any later version.
+%%
+%%	EGS is distributed in the hope that it will be useful,
+%%	but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%%	GNU General Public License for more details.
+%%
+%%	You should have received a copy of the GNU General Public License
+%%	along with EGS.  If not, see <http://www.gnu.org/licenses/>.
 
--module(egs_game).
--export([start/0]). % external
--export([supervisor_init/0, supervisor/0, listen/1, accept/2, process_init/2, process/0, char_select/0, area_load/4, loop/1]). % internal
+-module(psu_game).
+-export([start_link/1]). %% External.
+-export([supervisor_init/0, supervisor/0, listen/2, accept/2, process_init/2, process/0, char_select/0, area_load/4, loop/1]). %% Internal.
 
 -include("include/records.hrl").
--include("include/network.hrl").
 -include("include/maps.hrl").
 
-%% @doc Start the game server.
+-define(OPTIONS, [binary, {active, false}, {certfile, "priv/ssl/servercert.pem"}, {keyfile, "priv/ssl/serverkey.pem"}, {password, "alpha"}]).
 
-start() ->
-	SPid = spawn_link(?MODULE, supervisor_init, []),
-	LPid = spawn_link(?MODULE, listen, [SPid]),
+%% @spec start_link(Port) -> {ok,Pid::pid()}
+%% @doc Start the game server.
+start_link(Port) ->
+	SPid = spawn(?MODULE, supervisor_init, []),
+	LPid = spawn(?MODULE, listen, [Port, SPid]),
 	{ok, LPid}.
 
 %% @doc Game processes supervisor initialization.
@@ -64,8 +66,8 @@ supervisor_close(Pid) ->
 
 %% @doc Listen for connections.
 
-listen(SPid) ->
-	{ok, LSocket} = ssl:listen(?GAME_PORT, ?GAME_LISTEN_OPTIONS),
+listen(Port, SPid) ->
+	{ok, LSocket} = ssl:listen(Port, ?OPTIONS),
 	?MODULE:accept(LSocket, SPid).
 
 %% @doc Accept connections.