Index: config/rtwi.conf.sample
===================================================================
--- config/rtwi.conf.sample	(revision d84329c2a04cd83a68889579ef2aa22649e13e16)
+++ config/rtwi.conf.sample	(revision d84329c2a04cd83a68889579ef2aa22649e13e16)
@@ -0,0 +1,54 @@
+; full url of the rTWi (with a trailing slash)
+base =		http://example.com/
+
+; change, if you've renamed the index.html file
+index =		index.php
+
+; change, if you've renamed the input.php file
+input =		input.php
+
+; path to home directory of users (with heading and trailing slash)
+home_path =	/home/
+
+; path to the file which keeps the user related informations
+user_conf =	/etc/rtorrent/users.conf
+
+; language (english and hungarian is available)
+lang =		en
+
+; site theme (look for themes in the "themes" directory)
+site_theme = 	default_ajax
+
+; do a directory tree, which can be expanded/collapsed
+; set to "false" (without the quotes),
+; if your webserver is running on a slow machine
+; and you have torrents with a lots of files
+; (a few hundreds of files in a single torrent, and more)
+dodirtree =	true
+
+; true if ajax is allowed
+ajax =		true
+
+; true if dht is enabled
+dht =		true
+
+; true if users are allowed to download finished files from the webui
+download =	true
+
+; true if users are allowed to erase downloaded data from the webui
+erase =		true
+
+; true if flags are allowed in peers page
+flags =		false
+
+; true if hiding the filelist is allowed
+hidedirtree =	true
+
+; true if users are allowed to set the language of the web interface
+language =	true
+
+; true if users are allowed to set a meta-refresh interval
+refresh =	true
+
+; true if users are allowed to set throttle
+throttle =	true
Index: config/users.conf.sample
===================================================================
--- config/users.conf.sample	(revision d84329c2a04cd83a68889579ef2aa22649e13e16)
+++ config/users.conf.sample	(revision d84329c2a04cd83a68889579ef2aa22649e13e16)
@@ -0,0 +1,19 @@
+[user1]
+address =	unix:///home/user1/rpc.socket
+pass =		7e240de74fb1ed08fa08d38063f6a6a91462a815
+
+[user1]
+address =	http://example.com/RPC2
+pass =		7e240de74fb1ed08fa08d38063f6a6a91462a815
+
+[user1]
+address =	:12345
+pass =		7e240de74fb1ed08fa08d38063f6a6a91462a815
+
+[user1]
+address =	123.123.123.123:123456
+pass =		7e240de74fb1ed08fa08d38063f6a6a91462a815
+
+[user1]
+address =	unix:///home/cyla/torrent/.socket/rpc.socket
+pass =		5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8
Index: c/includes/rtwi.conf.sample
===================================================================
--- src/includes/rtwi.conf.sample	(revision d8d72975b108ed151de1d2f7dd0fc59c79e8bdf1)
+++ 	(revision )
@@ -1,54 +1,0 @@
-; full url of the rTWi (with a trailing slash)
-base =		http://example.com/
-
-; change, if you've renamed the index.html file
-index =		index.php
-
-; change, if you've renamed the input.php file
-input =		input.php
-
-; path to home directory of users (with heading and trailing slash)
-home_path =	/home/
-
-; path to the file which keeps the user related informations
-user_conf =	/etc/rtorrent/users.conf
-
-; language (english and hungarian is available)
-lang =		en
-
-; site theme (look for themes in the "themes" directory)
-site_theme = 	default_ajax
-
-; do a directory tree, which can be expanded/collapsed
-; set to "false" (without the quotes),
-; if your webserver is running on a slow machine
-; and you have torrents with a lots of files
-; (a few hundreds of files in a single torrent, and more)
-dodirtree =	true
-
-; true if ajax is allowed
-ajax =		true
-
-; true if dht is enabled
-dht =		true
-
-; true if users are allowed to download finished files from the webui
-download =	true
-
-; true if users are allowed to erase downloaded data from the webui
-erase =		true
-
-; true if flags are allowed in peers page
-flags =		false
-
-; true if hiding the filelist is allowed
-hidedirtree =	true
-
-; true if users are allowed to set the language of the web interface
-language =	true
-
-; true if users are allowed to set a meta-refresh interval
-refresh =	true
-
-; true if users are allowed to set throttle
-throttle =	true
Index: c/includes/users.conf.sample
===================================================================
--- src/includes/users.conf.sample	(revision d8d72975b108ed151de1d2f7dd0fc59c79e8bdf1)
+++ 	(revision )
@@ -1,19 +1,0 @@
-[user1]
-address =	unix:///home/user1/rpc.socket
-pass =		7e240de74fb1ed08fa08d38063f6a6a91462a815
-
-[user1]
-address =	http://example.com/RPC2
-pass =		7e240de74fb1ed08fa08d38063f6a6a91462a815
-
-[user1]
-address =	:12345
-pass =		7e240de74fb1ed08fa08d38063f6a6a91462a815
-
-[user1]
-address =	123.123.123.123:123456
-pass =		7e240de74fb1ed08fa08d38063f6a6a91462a815
-
-[user1]
-address =	unix:///home/cyla/torrent/.socket/rpc.socket
-pass =		5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8
Index: src/index.php
===================================================================
--- src/index.php	(revision d8d72975b108ed151de1d2f7dd0fc59c79e8bdf1)
+++ src/index.php	(revision d84329c2a04cd83a68889579ef2aa22649e13e16)
@@ -404,5 +404,5 @@
 		}
 	}
-	
+
 	$p_down_rate_arr = switch_bytes( $responses["p_down_rate"] );
 	$p_down_total_arr = switch_bytes( $responses["p_down_total"] );
@@ -553,5 +553,5 @@
 
 // reading config files
-$config = parse_ini_file( "includes/rtwi.conf", true );
+$config = parse_ini_file( "config/rtwi.conf", true );
 $users = parse_ini_file( $config["user_conf"], true );
 
@@ -573,5 +573,5 @@
 // initializing xmlrpc methods
 $xmlrpc_methods = array(
-	"si"	=> $config["dht"] === "1" ? 
+	"si"	=> $config["dht"] === "1" ?
 			array( "dht.statistics", "network.bind_address", "pieces.hash.on_completion", "protocol.connection.leech", "protocol.connection.seed", "dht.port", "directory.default", "throttle.global_down.max_rate", "network.http.cacert", "network.http.capath", "network.http.proxy_address", "network.local_address", "throttle.max_downloads.div", "throttle.max_downloads.global", "system.file.max_size", "pieces.memory.max", "network.max_open_files", "network.http.max_open", "network.max_open_sockets", "throttle.max_peers.normal", "throttle.max_peers.seed", "throttle.max_uploads", "throttle.max_uploads.div", "throttle.max_uploads.global", "pieces.memory.current", "throttle.min_peers.normal", "throttle.min_peers.seed", "session.name", "protocol.pex", "network.port_open", "network.port_random", "network.port_range", "pieces.preload.min_size", "pieces.preload.min_rate", "pieces.preload.type", "network.proxy_address", "network.receive_buffer.size", "pieces.sync.always_safe", "network.scgi.dont_route", "network.send_buffer.size", "session.path", "session.use_lock", "session.on_completion", "system.file.split_size", "system.file.split_suffix", "pieces.stats_not_preloaded", "pieces.stats_preloaded", "pieces.sync.timeout_safe", "pieces.sync.timeout", "trackers.numwant", "throttle.global_up.max_rate", "trackers.use_udp", "system.client_version", "system.cwd", "system.hostname", "system.library_version", "system.pid", "view.list" ) :
 			array( "network.bind_address", "pieces.hash.on_completion", "protocol.connection.leech", "protocol.connection.seed", "directory.default", "throttle.global_down.max_rate", "network.http.cacert", "network.http.capath", "network.http.proxy_address", "network.local_address", "throttle.max_downloads.div", "throttle.max_downloads.global", "system.file.max_size", "pieces.memory.max", "network.max_open_files", "network.http.max_open", "network.max_open_sockets", "throttle.max_peers.normal", "throttle.max_peers.seed", "throttle.max_uploads", "throttle.max_uploads.div", "throttle.max_uploads.global", "pieces.memory.current", "throttle.min_peers.normal", "throttle.min_peers.seed", "session.name", "protocol.pex", "network.port_open", "network.port_random", "network.port_range", "pieces.preload.min_size", "pieces.preload.min_rate", "pieces.preload.type", "network.proxy_address", "network.receive_buffer.size", "pieces.sync.always_safe", "network.scgi.dont_route", "network.send_buffer.size", "session.path", "session.use_lock", "session.on_completion", "system.file.split_size", "system.file.split_suffix", "pieces.stats_not_preloaded", "pieces.stats_preloaded", "pieces.sync.timeout_safe", "pieces.sync.timeout", "trackers.numwant", "throttle.global_up.max_rate", "trackers.use_udp", "system.client_version", "system.cwd", "system.hostname", "system.library_version", "system.pid", "view.list" ),
@@ -922,5 +922,5 @@
 						}
 						$response = $xmlrpc->fetch();
-						
+
 						// process the peer info
 						for ( $i = 0; $i < count( $response ); $i++ ) {
@@ -1271,5 +1271,5 @@
 	@header( "Content-Length: {$filesize}" );
 	@header( "Content-Disposition: attachment; filename=\"{$response["f.path"]}\"" );
-	
+
 	// sending the file
 	readfile( $path );
Index: src/input.php
===================================================================
--- src/input.php	(revision d8d72975b108ed151de1d2f7dd0fc59c79e8bdf1)
+++ src/input.php	(revision d84329c2a04cd83a68889579ef2aa22649e13e16)
@@ -22,5 +22,5 @@
 session_start();
 
-$config = parse_ini_file( "includes/rtwi.conf", true );
+$config = parse_ini_file( "config/rtwi.conf", true );
 $users = parse_ini_file( $config["user_conf"], true );
 
@@ -306,5 +306,5 @@
 					header( "location: {$config["index"]}?mod=addtorrent" );
 					exit;
-				
+
 					break;
 				}
@@ -313,5 +313,5 @@
 					header( "location: {$config["index"]}?mod=addtorrent" );
 					exit;
-				
+
 					break;
 				}
@@ -320,5 +320,5 @@
 					header( "location: {$config["index"]}?mod=addtorrent" );
 					exit;
-				
+
 					break;
 				}
@@ -327,5 +327,5 @@
 					header( "location: {$config["index"]}?mod=addtorrent" );
 					exit;
-				
+
 					break;
 				}
@@ -334,5 +334,5 @@
 					header( "location: {$config["index"]}?mod=addtorrent" );
 					exit;
-				
+
 					break;
 				}
@@ -341,5 +341,5 @@
 					header( "location: {$config["index"]}?mod=addtorrent" );
 					exit;
-				
+
 					break;
 				}
@@ -348,5 +348,5 @@
 					header( "location: {$config["index"]}?mod=addtorrent" );
 					exit;
-				
+
 					break;
 				}
@@ -701,5 +701,5 @@
 			}
 		}
-		
+
 		break;
 	}
