Index: /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/Dispatcher.java
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/Dispatcher.java	(revision 2474)
+++ /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/Dispatcher.java	(revision 2475)
@@ -142,5 +142,5 @@
 								ConnectorHandler.getUserFilesPath(),
 								"/".concat(typeStr.toLowerCase()), currentFolderStr);
-						getResponse = getFileAndFolders(command, type, currentFolderStr, responseUrl);
+						getResponse = getFoldersAndFiles(command, type, currentFolderStr, responseUrl);
 					} else 
 						getResponse = GetResponse.getErrorUnknown();
@@ -178,5 +178,5 @@
 	 * @throws UnknownException
 	 */
-	private GetResponse getFileAndFolders(final CommandHandler command, final ResourceType type, final String currentFolderStr, final String responseUrl)
+	private GetResponse getFoldersAndFiles(final CommandHandler command, final ResourceType type, final String currentFolderStr, final String responseUrl)
 			throws InvalidCurrentFolderException, SecurityIssueException, UnknownException {
 		GetResponse getResponse = new GetResponse(command, type, currentFolderStr, responseUrl);
Index: /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/impl/SimpleFileSystemConnector.java
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/impl/SimpleFileSystemConnector.java	(revision 2474)
+++ /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/impl/SimpleFileSystemConnector.java	(revision 2475)
@@ -41,5 +41,4 @@
 import net.fckeditor.connector.exception.UnknownException;
 import net.fckeditor.handlers.ConnectorHandler;
-import net.fckeditor.handlers.PropertiesLoader;
 import net.fckeditor.handlers.ResourceType;
 import net.fckeditor.tool.UtilsFile;
Index: /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/tool/UtilsResponse.java
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/tool/UtilsResponse.java	(revision 2474)
+++ /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/tool/UtilsResponse.java	(revision 2475)
@@ -35,5 +35,6 @@
 	/**
 	 * Constructs a URL from different parameters. This method is about to
-	 * change in version 2.5. 
+	 * change in version 2.5.
+	 * TODO has to be improved
 	 */
 	public static String constructResponseUrl(String filePath, String resourceTypePath, String urlPath) {