diff --git a/src/Notesmaster2/.gitignore b/src/Notesmaster/.gitignore similarity index 100% rename from src/Notesmaster2/.gitignore rename to src/Notesmaster/.gitignore diff --git a/src/Notesmaster2/.idea/.gitignore b/src/Notesmaster/.idea/.gitignore similarity index 100% rename from src/Notesmaster2/.idea/.gitignore rename to src/Notesmaster/.idea/.gitignore diff --git a/src/Notesmaster2/.idea/.name b/src/Notesmaster/.idea/.name similarity index 100% rename from src/Notesmaster2/.idea/.name rename to src/Notesmaster/.idea/.name diff --git a/src/Notesmaster2/.idea/compiler.xml b/src/Notesmaster/.idea/compiler.xml similarity index 100% rename from src/Notesmaster2/.idea/compiler.xml rename to src/Notesmaster/.idea/compiler.xml diff --git a/src/Notesmaster2/.idea/deploymentTargetSelector.xml b/src/Notesmaster/.idea/deploymentTargetSelector.xml similarity index 100% rename from src/Notesmaster2/.idea/deploymentTargetSelector.xml rename to src/Notesmaster/.idea/deploymentTargetSelector.xml diff --git a/src/Notesmaster2/.idea/gradle.xml b/src/Notesmaster/.idea/gradle.xml similarity index 100% rename from src/Notesmaster2/.idea/gradle.xml rename to src/Notesmaster/.idea/gradle.xml diff --git a/src/Notesmaster2/.idea/migrations.xml b/src/Notesmaster/.idea/migrations.xml similarity index 100% rename from src/Notesmaster2/.idea/migrations.xml rename to src/Notesmaster/.idea/migrations.xml diff --git a/src/Notesmaster2/.idea/misc.xml b/src/Notesmaster/.idea/misc.xml similarity index 89% rename from src/Notesmaster2/.idea/misc.xml rename to src/Notesmaster/.idea/misc.xml index 74dd639..b2c751a 100644 --- a/src/Notesmaster2/.idea/misc.xml +++ b/src/Notesmaster/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/src/Notesmaster2/.idea/runConfigurations.xml b/src/Notesmaster/.idea/runConfigurations.xml similarity index 100% rename from src/Notesmaster2/.idea/runConfigurations.xml rename to src/Notesmaster/.idea/runConfigurations.xml diff --git a/src/Notesmaster2/app/.gitignore b/src/Notesmaster/app/.gitignore similarity index 100% rename from src/Notesmaster2/app/.gitignore rename to src/Notesmaster/app/.gitignore diff --git a/src/Notesmaster2/app/build.gradle.kts b/src/Notesmaster/app/build.gradle.kts similarity index 71% rename from src/Notesmaster2/app/build.gradle.kts rename to src/Notesmaster/app/build.gradle.kts index a14435e..7030828 100644 --- a/src/Notesmaster2/app/build.gradle.kts +++ b/src/Notesmaster/app/build.gradle.kts @@ -3,6 +3,15 @@ plugins { } android { + packaging { + resources.excludes.add("META-INF/DEPENDENCIES"); + resources.excludes.add("META-INF/NOTICE"); + resources.excludes.add("META-INF/LICENSE"); + resources.excludes.add("META-INF/LICENSE.txt"); + resources.excludes.add("META-INF/NOTICE.txt"); + } + + namespace = "net.micode.notes" compileSdk = 34 @@ -29,13 +38,6 @@ android { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } - packaging { - resources.excludes.add("META-INF/DEPENDENCIES"); - resources.excludes.add("META-INF/NOTICE"); - resources.excludes.add("META-INF/LICENSE"); - resources.excludes.add("META-INF/LICENSE.txt"); - resources.excludes.add("META-INF/NOTICE.txt"); - } } dependencies { @@ -44,9 +46,14 @@ dependencies { implementation(libs.material) implementation(libs.activity) implementation(libs.constraintlayout) - implementation(files("F:\\Notesmaster2\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-osgi-4.5.14.jar")) - implementation(files("F:\\Notesmaster2\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-win-4.5.14.jar")) - implementation(files("F:\\Notesmaster2\\httpcomponents-client-4.5.14-bin\\lib\\httpcore-4.4.16.jar")) +// implementation(fileTree(mapOf( +// "dir" to "D:\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib", +// "include" to listOf("*.aar", "*.jar"), +// "exclude" to listOf("") +// ))) + implementation(files("D:\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-osgi-4.5.14.jar")) + implementation(files("D:\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-win-4.5.14.jar")) + implementation(files("D:\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpcore-4.4.16.jar")) testImplementation(libs.junit) androidTestImplementation(libs.ext.junit) androidTestImplementation(libs.espresso.core) diff --git a/src/Notesmaster2/app/proguard-rules.pro b/src/Notesmaster/app/proguard-rules.pro similarity index 100% rename from src/Notesmaster2/app/proguard-rules.pro rename to src/Notesmaster/app/proguard-rules.pro diff --git a/src/Notesmaster2/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java b/src/Notesmaster/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java similarity index 100% rename from src/Notesmaster2/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java rename to src/Notesmaster/app/src/androidTest/java/net/micode/notes/ExampleInstrumentedTest.java diff --git a/src/Notesmaster2/app/src/main/AndroidManifest.xml b/src/Notesmaster/app/src/main/AndroidManifest.xml similarity index 87% rename from src/Notesmaster2/app/src/main/AndroidManifest.xml rename to src/Notesmaster/app/src/main/AndroidManifest.xml index b33507c..555f665 100644 --- a/src/Notesmaster2/app/src/main/AndroidManifest.xml +++ b/src/Notesmaster/app/src/main/AndroidManifest.xml @@ -2,16 +2,6 @@ - - - - - - - - - - + - + @@ -151,7 +141,6 @@ - \ No newline at end of file diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/MainActivity.java b/src/Notesmaster/app/src/main/java/net/micode/notes/MainActivity.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/MainActivity.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/MainActivity.java diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/data/Contact.java b/src/Notesmaster/app/src/main/java/net/micode/notes/data/Contact.java new file mode 100644 index 0000000..a1d5cfd --- /dev/null +++ b/src/Notesmaster/app/src/main/java/net/micode/notes/data/Contact.java @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2010 - 2011, The MiCode Open Source Community (www.micode.net) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE 2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.micode.notes.data; + +import android.content.Context; +import android.database.Cursor; +import android.provider.ContactsContract.CommonDataKinds.Phone; +import android.provider.ContactsContract.Data; +import android.telephony.PhoneNumberUtils; +import android.util.Log; + +import java.util.HashMap; + +// Contact类用于根据电话号码查找对应的联系人姓名，并且使用了缓存机制来提高查找效率 +public class Contact { + + // 用于缓存已经查询过的电话号码与对应的联系人姓名，避免重复查询数据库 + private static HashMap sContactCache; + // 用于日志输出的标签，方便在日志中识别该类相关的日志信息 + private static final String TAG = "Contact"; + + // 构建查询联系人的条件语句，用于在 ContactsContract.Data 表中查找匹配的联系人记录 + // 这个条件语句的逻辑是查找与给定电话号码匹配（使用 PHONE_NUMBERS_EQUAL 函数判断相等）， + // 并且 MIME 类型为 Phone.CONTENT_ITEM_TYPE ，同时 RAW_CONTACT_ID 在满足一定条件（从 phone_lookup 表中查询，min_match = '+'）的记录中 + private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER + + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" + + " AND " + Data.RAW_CONTACT_ID + " IN " + + "(SELECT raw_contact_id " + + " FROM phone_lookup" + + " WHERE min_match = '+')"; + + // 根据给定的上下文（Context）和电话号码（phoneNumber），查找对应的联系人姓名 + public static String getContact(Context context, String phoneNumber) { + // 如果缓存为空，则初始化缓存的 HashMap，用于存储电话号码和对应联系人姓名的映射关系 + if (sContactCache == null) { + sContactCache = new HashMap(); + } + + // 首先检查缓存中是否已经存在该电话号码对应的联系人姓名，如果存在则直接返回缓存中的结果，避免再次查询数据库 + if (sContactCache.containsKey(phoneNumber)) { + return sContactCache.get(phoneNumber); + } + + // 根据给定的电话号码，替换查询条件语句中的 '+' 为合适的匹配格式（使用 PhoneNumberUtils 工具类进行转换） + // 目的是构建一个符合当前电话号码格式的精确查询条件 + String selection = CALLER_ID_SELECTION.replace("+", + PhoneNumberUtils.toCallerIDMinMatch(phoneNumber)); + + // 通过上下文的 ContentResolver 查询 ContactsContract.Data 表，获取满足条件的联系人记录 + // 查询的列只包含联系人的显示名称（Phone.DISPLAY_NAME） + // 传递构建好的查询条件（selection）以及要查询的电话号码参数（phoneNumber） + Cursor cursor = context.getContentResolver().query( + Data.CONTENT_URI, + new String[]{Phone.DISPLAY_NAME}, + selection, + new String[]{phoneNumber}, + null); + + // 如果查询结果游标（Cursor）不为空，并且游标可以移动到第一条记录（表示有匹配的联系人记录） + if (cursor!= null && cursor.moveToFirst()) { + try { + // 从游标中获取第一条记录的联系人显示名称（索引为 0，因为查询只选择了一列） + String name = cursor.getString(0); + // 将获取到的电话号码和对应的联系人姓名存入缓存中，方便下次查询使用 + sContactCache.put(phoneNumber, name); + // 返回查找到的联系人姓名 + return name; + } catch (IndexOutOfBoundsException e) { + // 如果在从游标获取数据时出现越界异常（例如查询结果列数与预期不符等情况），记录错误日志 + Log.e(TAG, " Cursor get string error " + e.toString()); + return null; + } finally { + // 无论是否成功获取到联系人姓名，都要关闭游标，释放资源 + cursor.close(); + } + } else { + // 如果游标为空或者游标中没有匹配的记录，记录调试日志，表示没有找到与该电话号码匹配的联系人 + Log.d(TAG, "No contact matched with number:" + phoneNumber); + return null; + } + } +} \ No newline at end of file diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notesmaster/app/src/main/java/net/micode/notes/data/Notes.java new file mode 100644 index 0000000..367d407 --- /dev/null +++ b/src/Notesmaster/app/src/main/java/net/micode/notes/data/Notes.java @@ -0,0 +1,261 @@ +/* + * Copyright (c) 2010 - 2011, The MiCode Open Source Community (www.micode.net) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE 2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.micode.notes.data; + +import android.net.Uri; + +// Notes类用于定义与笔记（Notes）相关的各种常量、接口以及内部类，可能用于管理笔记应用中的数据结构、数据库操作等功能 +public class Notes { + + // 定义笔记应用的授权（Authority）名称，用于在内容提供器（Content Provider）相关操作中标识该应用的数据源 + public static final String AUTHORITY = "micode_notes"; + // 用于日志输出等场景的标签，方便识别该类相关的日志信息 + public static final String TAG = "Notes"; + + // 定义不同类型笔记的类型码，用于区分不同性质的笔记，方便后续根据类型进行不同的处理逻辑 + public static final int TYPE_NOTE = 0; + public static final int TYPE_FOLDER = 1; + public static final int TYPE_SYSTEM = 2; + + /** + * 以下是系统文件夹的标识符（IDs），用于唯一标识不同功能的系统文件夹。 + * {@link Notes#ID_ROOT_FOLDER } 是默认文件夹的标识符，通常作为笔记的根目录等用途。 + * {@link Notes#ID_TEMPARAY_FOLDER } 用于存放那些不属于任何文件夹的笔记，可能是临时存放等情况。 + * {@link Notes#ID_CALL_RECORD_FOLDER} 用于存储通话记录相关的笔记，便于对通话记录进行统一管理。 + */ + public static final int ID_ROOT_FOLDER = 0; + public static final int ID_TEMPARAY_FOLDER = -1; + public static final int ID_CALL_RECORD_FOLDER = -2; + public static final int ID_TRASH_FOLER = -3; + + // 定义一系列用于传递额外信息的Intent的键（Key），在不同的Activity或组件间传递特定数据时使用，例如传递提醒日期、背景颜色ID等信息 + public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date"; + public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id"; + public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id"; + public static final String INTENT_EXTRA_WIDGET_TYPE = "net.micode.notes.widget_type"; + public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id"; + public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date"; + + // 定义不同类型的桌面小部件（Widget）的类型码，用于区分不同规格或样式的小部件，方便进行相应的布局和功能处理 + public static final int TYPE_WIDGET_INVALIDE = -1; + public static final int TYPE_WIDGET_2X = 0; + public static final int TYPE_WIDGET_4X = 1; + + // DataConstants内部类，用于定义笔记相关的数据类型常量，目前看起来主要涉及文本笔记（TextNote）和通话记录笔记（CallNote）的内容类型 + public static class DataConstants { + public static final String NOTE = TextNote.CONTENT_ITEM_TYPE; + public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE; + } + + /** + * 用于查询所有笔记和文件夹的统一资源标识符（Uri），通过这个Uri可以使用内容提供器（Content Provider）来获取相应的数据， + * 其格式遵循 Android 中 content:// 协议的规范，后面跟应用的授权名称和具体的路径（这里是 /note）。 + */ + public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note"); + + /** + * 用于查询数据的统一资源标识符（Uri），同样基于 content:// 协议，用于获取更通用的数据，具体用途可能由使用该Uri的代码逻辑决定。 + */ + public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data"); + + // NoteColumns接口，定义了笔记相关的各个列（Column）名称及其对应的数据类型，这些列可能用于数据库表结构中存储笔记的各种属性信息 + public interface NoteColumns { + /** + * 笔记或文件夹的唯一标识符（ID），在数据库表中用于唯一区分每一条记录，类型为长整型（INTEGER，对应数据库中的 long 类型）。 + */ + public static final String ID = "_id"; + + /** + * 笔记或文件夹的父级ID，用于构建笔记的层级结构，比如文件夹下包含子笔记等情况，类型为长整型（INTEGER，对应数据库中的 long 类型）。 + */ + public static final String PARENT_ID = "parent_id"; + + /** + * 笔记或文件夹的创建日期，用于记录创建时间信息，方便后续按时间排序、筛选等操作，类型为长整型（INTEGER，对应数据库中的 long 类型）。 + */ + public static final String CREATED_DATE = "created_date"; + + /** + * 笔记或文件夹的最后修改日期，用于跟踪记录的更新情况，类型为长整型（INTEGER，对应数据库中的 long 类型）。 + */ + public static final String MODIFIED_DATE = "modified_date"; + + /** + * 提醒日期，可能用于设置笔记提醒功能相关的时间，类型为长整型（INTEGER，对应数据库中的 long 类型）。 + */ + public static final String ALERTED_DATE = "alert_date"; + + /** + * 对于文件夹来说是文件夹的名称，对于笔记来说是文本内容的摘要等信息，类型为文本（TEXT）类型，方便展示和快速查看关键内容。 + */ + public static final String SNIPPET = "snippet"; + + /** + * 笔记对应的桌面小部件（Widget）的ID，用于关联笔记和特定的小部件，类型为长整型（INTEGER，对应数据库中的 long 类型）。 + */ + public static final String WIDGET_ID = "widget_id"; + + /** + * 笔记对应的桌面小部件（Widget）的类型，用于区分不同样式或功能的小部件，类型为长整型（INTEGER，对应数据库中的 long 类型）。 + */ + public static final String WIDGET_TYPE = "widget_id"; + + /** + * 笔记的背景颜色的ID，用于个性化笔记的显示外观，类型为长整型（INTEGER，对应数据库中的 long 类型）。 + */ + public static final String BG_COLOR_ID = "bg_color_id"; + + /** + * 用于表示笔记是否有附件，对于文本笔记通常没有附件则为 0，对于多媒体等有附件的笔记则为 1，类型为整型（INTEGER）。 + */ + public static final String HAS_ATTACHMENT = "has_attachment"; + + /** + * 文件夹中包含的笔记数量，方便统计和展示文件夹的相关信息，类型为长整型（INTEGER，对应数据库中的 long 类型）。 + */ + public static final String NOTES_COUNT = "notes_count"; + + /** + * 文件类型，用于区分是文件夹还是笔记，类型为整型（INTEGER），可能对应前面定义的 TYPE_NOTE、TYPE_FOLDER 等类型码。 + */ + public static final String TYPE = "type"; + + /** + * 最后一次同步的ID，可能用于与服务器等外部数据源同步数据时的标识和记录，类型为长整型（INTEGER，对应数据库中的 long 类型）。 + */ + public static final String SYNC_ID = "sync_id"; + + /** + * 标志位，用于指示本地是否有修改，方便判断数据是否需要同步等操作，类型为整型（INTEGER）。 + */ + public static final String LOCAL_MODIFIED = "local_modified"; + + /** + * 在移动到临时文件夹之前的原始父级ID，可能用于记录笔记的历史位置等信息，类型为整型（INTEGER）。 + */ + public static final String ORIGIN_PARENT_ID = "origin_parent_id"; + + /** + * 与 gtask 相关的ID，可能用于与特定任务管理功能的对接，类型为文本（TEXT）类型。 + */ + public static final String GTASK_ID = "gtask_id"; + + /** + * 版本代码，用于版本管理，比如数据库结构升级等场景下判断版本差异，类型为长整型（INTEGER，对应数据库中的 long 类型）。 + */ + public static final String VERSION = "version"; + } + + // DataColumns接口，定义了数据相关的各个列（Column）名称及其对应的数据类型，用于存储更通用的数据信息，可能涵盖多种类型笔记的数据细节 + public interface DataColumns { + /** + * 数据行的唯一标识符（ID），用于在相应的数据表中唯一区分每一条记录，类型为长整型（INTEGER，对应数据库中的 long 类型）。 + */ + public static final String ID = "_id"; + + /** + * 该行数据所代表的项目的MIME类型，用于标识数据的具体格式、性质等，类型为文本（TEXT）类型，例如不同类型笔记对应不同的MIME类型。 + */ + public static final String MIME_TYPE = "mime_type"; + + /** + * 该数据所属笔记的引用ID，用于建立数据与对应笔记的关联关系，类型为长整型（INTEGER，对应数据库中的 long 类型）。 + */ + public static final String NOTE_ID = "note_id"; + + /** + * 数据对应的笔记或文件夹的创建日期，和前面的 CREATED_DATE 类似，用于记录创建时间信息，类型为长整型（INTEGER，对应数据库中的 long 类型）。 + */ + public static final String CREATED_DATE = "created_date"; + + /** + * 数据对应的笔记或文件夹的最后修改日期，用于跟踪数据的更新情况，类型为长整型（INTEGER，对应数据库中的 long 类型）。 + */ + public static final String MODIFIED_DATE = "modified_date"; + + /** + * 数据的具体内容，类型为文本（TEXT）类型，根据不同的数据类型和用途存储相应的文本信息。 + */ + public static final String CONTENT = "content"; + + /** + * 通用数据列，其含义根据 {@link #MIME_TYPE} 的具体类型而定，用于整数数据类型，方便存储和扩展不同类型笔记的各种整数相关属性，类型为整型（INTEGER）。 + */ + public static final String DATA1 = "data1"; + + /** + * 通用数据列，其含义根据 {@link #MIME_TYPE} 的具体类型而定，用于整数数据类型，和 DATA1 类似，类型为整型（INTEGER）。 + */ + public static final String DATA2 = "data2"; + + /** + * 通用数据列，其含义根据 {@link #MIME_TYPE} 的具体类型而定，用于文本数据类型，方便存储各种文本相关的额外属性，类型为文本（TEXT）类型。 + */ + public static final String DATA3 = "data3"; + + /** + * 通用数据列，其含义根据 {@link #MIME_TYPE} 的具体类型而定，用于文本数据类型，和 DATA3 类似，类型为文本（TEXT）类型。 + */ + public static final String DATA4 = "data3"; + + /** + * 通用数据列，其含义根据 {@link #MIME_TYPE} 的具体类型而定，用于文本数据类型，和 DATA3 类似，类型为文本（TEXT）类型。 + */ + public static final String DATA5 = "data3"; + } + + // TextNote内部类，继承自 DataColumns，用于定义文本笔记相关的特定属性和操作，比如文本笔记的模式、内容类型等信息 + public static final class TextNote implements DataColumns { + /** + * 用于指示文本是否处于复选框列表（check list）模式，1 表示处于该模式，0 表示正常模式，方便对文本笔记的展示和编辑进行不同处理，类型为整型（Integer）。 + */ + public static final String MODE = DATA1; + + public static final int MODE_CHECK_LIST = 1; + + // 文本笔记的内容类型，用于标识这是一个目录形式的文本笔记相关内容，遵循 Android 的 vnd.android.cursor.dir 规范，用于内容提供器等相关操作。 + public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note"; + + // 文本笔记的具体项目内容类型，遵循 Android 的 vnd.android.cursor.item 规范，用于更具体的单个文本笔记项目相关操作。 + public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note"; + + // 用于查询文本笔记的统一资源标识符（Uri），通过这个 Uri 可以使用内容提供器（Content Provider）来获取文本笔记相关的数据，格式遵循 Android 中 content:// 协议的规范。 + public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note"); + } + + // CallNote内部类，同样继承自 DataColumns，用于定义通话记录笔记相关的特定属性和操作，比如通话日期、电话号码等信息 + public static final class CallNote implements DataColumns { + /** + * 通话记录的通话日期，用于记录通话发生的时间，类型为长整型（INTEGER，对应数据库中的 long 类型）。 + */ + public static final String CALL_DATE = DATA1; + + /** + * 通话记录对应的电话号码，用于记录通话的对方号码等信息，类型为文本（TEXT）类型。 + */ + public static final String PHONE_NUMBER = DATA3; + + // 通话记录笔记的内容类型，用于标识这是一个目录形式的通话记录笔记相关内容，遵循 Android 的 vnd.android.cursor.dir 规范，用于内容提供器等相关操作。 + public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note"; + + // 通话记录笔记的具体项目内容类型，遵循 Android 的 vnd.android.cursor.item 规范，用于更具体的单个通话记录笔记项目相关操作。 + public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note"; + + // 用于查询通话记录笔记的统一资源标识符（Uri），通过这个 Uri 可以使用内容提供器（Content Provider）来获取通话记录笔记相关的数据，格式遵循 Android 中 content:// 协议的规范。 + public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note"); + } +} \ No newline at end of file diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notesmaster/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java new file mode 100644 index 0000000..19f04df --- /dev/null +++ b/src/Notesmaster/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -0,0 +1,284 @@ +/* + * Copyright (c) 2010 - 2011, The MiCode Open Source Community (www.micode.net) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE 2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.micode.notes.data; + +import android.content.ContentValues; +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import android.util.Log; + +import net.micode.notes.data.Notes.DataColumns; +import net.micode.notes.data.Notes.DataConstants; +import net.micode.notes.data.Notes.NoteColumns; + +// NotesDatabaseHelper类继承自SQLiteOpenHelper，用于管理笔记应用相关数据库的创建、升级以及数据库中表结构、触发器等的初始化操作 +public class NotesDatabaseHelper extends SQLiteOpenHelper { + + // 定义数据库的名称，用于在本地存储中标识该笔记应用对应的数据库文件 + private static final String DB_NAME = "note.db"; + + // 定义数据库的版本号，用于在数据库结构发生变化时进行版本控制，方便执行相应的升级逻辑 + private static final int DB_VERSION = 4; + + // TABLE接口定义了数据库中两张表的名称常量，方便在代码中统一引用，避免硬编码表名，提高代码的可维护性 + public interface TABLE { + public static final String NOTE = "note"; + public static final String DATA = "data"; + } + + // 用于日志输出的标签，方便在日志中识别该类相关的数据库操作信息 + private static final String TAG = "NotesDatabaseHelper"; + + // 采用单例模式，用于保证整个应用中只有一个NotesDatabaseHelper实例，方便统一管理数据库操作 + private static NotesDatabaseHelper mInstance; + + // 创建"note"表的SQL语句，定义了表的各个列名、数据类型以及默认值等信息，用于存储笔记相关的各种属性数据 + private static final String CREATE_NOTE_TABLE_SQL = + "CREATE TABLE " + TABLE.NOTE + "(" + + NoteColumns.ID + " INTEGER PRIMARY KEY," + + NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," + + NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," + + NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + + ")"; + + // 创建"data"表的SQL语句，同样定义了表的各个列名、数据类型以及默认值等信息，用于存储与笔记相关的数据内容以及其他通用数据属性 + private static final String CREATE_DATA_TABLE_SQL = + "CREATE TABLE " + TABLE.DATA + "(" + + DataColumns.ID + " INTEGER PRIMARY KEY," + + DataColumns.MIME_TYPE + " TEXT NOT NULL," + + DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," + + DataColumns.DATA1 + " INTEGER," + + DataColumns.DATA2 + " INTEGER," + + DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," + + DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," + + DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + + ")"; + + // 创建基于"data"表中"NOTE_ID"列的索引的SQL语句，通过创建索引可以提高根据笔记ID查询相关数据的效率 + private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = + "CREATE INDEX IF NOT EXISTS note_id_index ON " + + TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; + + /** + * 以下是一系列触发器（Trigger）相关的SQL语句定义，用于在数据库中满足特定条件时自动执行相应的操作，实现数据的关联更新、删除等逻辑。 + + * 当将笔记移动到文件夹时，增加文件夹的笔记数量的触发器定义。 + * 在"note"表的"PARENT_ID"列更新后触发，会根据新的父文件夹ID增加对应文件夹的笔记数量。 + */ + private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = + "CREATE TRIGGER increase_folder_count_on_update " + + " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + + " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + + " END"; + + /** + * 当从文件夹中移出笔记时，减少文件夹的笔记数量的触发器定义。 + * 在"note"表的"PARENT_ID"列更新后触发，会根据旧的父文件夹ID减少对应文件夹的笔记数量，并且要确保笔记数量大于0才进行减少操作。 + */ + private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = + "CREATE TRIGGER decrease_folder_count_on_update " + + " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + + " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + + " AND " + NoteColumns.NOTES_COUNT + ">0" + ";" + + " END"; + + /** + * 当向文件夹中插入新笔记时，增加文件夹的笔记数量的触发器定义。 + * 在"note"表插入新记录后触发，会根据新插入笔记的父文件夹ID增加对应文件夹的笔记数量。 + */ + private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = + "CREATE TRIGGER increase_folder_count_on_insert " + + " AFTER INSERT ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + + " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + + " END"; + + /** + * 当从文件夹中删除笔记时，减少文件夹的笔记数量的触发器定义。 + * 在"note"表删除记录后触发，会根据被删除笔记的旧父文件夹ID减少对应文件夹的笔记数量，并且要确保笔记数量大于0才进行减少操作。 + */ + private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = + "CREATE TRIGGER decrease_folder_count_on_delete " + + " AFTER DELETE ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + + " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + + " AND " + NoteColumns.NOTES_COUNT + ">0;" + + " END"; + + /** + * 当插入类型为 {@link DataConstants#NOTE} 的数据时，更新笔记内容的触发器定义。 + * 在"data"表插入新记录后触发，如果新插入数据的MIME类型是笔记类型（DataConstants.NOTE），则将对应笔记的摘要（SNIPPET）更新为新插入数据的内容（CONTENT）。 + */ + private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = + "CREATE TRIGGER update_note_content_on_insert " + + " AFTER INSERT ON " + TABLE.DATA + + " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + + " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + + " END"; + + /** + * 当类型为 {@link DataConstants#NOTE} 的数据发生更新时，更新笔记内容的触发器定义。 + * 在"data"表更新记录后触发，如果更新前数据的MIME类型是笔记类型（DataConstants.NOTE），则将对应笔记的摘要（SNIPPET）更新为更新后数据的内容（CONTENT）。 + */ + private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER = + "CREATE TRIGGER update_note_content_on_update " + + " AFTER UPDATE ON " + TABLE.DATA + + " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + + " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + + " END"; + + /** + * 当类型为 {@link DataConstants#NOTE} 的数据被删除时，更新笔记内容的触发器定义。 + * 在"data"表删除记录后触发，如果被删除数据的MIME类型是笔记类型（DataConstants.NOTE），则将对应笔记的摘要（SNIPPET）清空。 + */ + private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER = + "CREATE TRIGGER update_note_content_on_delete " + + " AFTER delete ON " + TABLE.DATA + + " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.SNIPPET + "=''" + + " WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" + + " END"; + + /** + * 当笔记被删除时，删除属于该笔记的数据的触发器定义。 + * 在"note"表删除记录后触发，会根据被删除笔记的ID删除"data"表中属于该笔记的相关数据记录。 + */ + private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER = + "CREATE TRIGGER delete_data_on_delete " + + " AFTER DELETE ON " + TABLE.NOTE + + " BEGIN" + + " DELETE FROM " + TABLE.DATA + + " WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" + + " END"; + + /** + * 当文件夹被删除时，删除属于该文件夹的笔记的触发器定义。 + * 在"note"表删除记录后触发，会根据被删除文件夹的ID删除"note"表中属于该文件夹的相关笔记记录。 + */ + private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER = + "CREATE TRIGGER folder_delete_notes_on_delete " + + " AFTER DELETE ON " + TABLE.NOTE + + " BEGIN" + + " DELETE FROM " + TABLE.NOTE + + " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + + " END"; + + /** + * 当文件夹被移动到回收站文件夹时，移动属于该文件夹的笔记到回收站文件夹的触发器定义。 + * 在"note"表更新记录（当父文件夹ID更新为回收站文件夹ID时）触发，会将原属于该文件夹的所有笔记的父文件夹ID也更新为回收站文件夹ID。 + */ + private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER = + "CREATE TRIGGER folder_move_notes_on_trash " + + " AFTER UPDATE ON " + TABLE.NOTE + + " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + + " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + + " END"; + + // 构造函数，调用父类（SQLiteOpenHelper）的构造函数，传入上下文、数据库名称、游标工厂（这里为null）以及数据库版本号，用于初始化数据库帮助类 + public NotesDatabaseHelper(Context context) { + super(context, DB_NAME, null, DB_VERSION); + } + + // 在数据库中创建"note"表，同时重新创建与"note"表相关的触发器，并创建系统文件夹记录，最后记录日志表示"note"表已创建完成 + public void createNoteTable(SQLiteDatabase db) { + db.execSQL(CREATE_NOTE_TABLE_SQL); + reCreateNoteTableTriggers(db); + createSystemFolder(db); + Log.d(TAG, "note table has been created"); + } + + // 重新创建与"note"表相关的所有触发器，先删除已存在的同名触发器（如果有的话），再重新创建，以确保触发器的逻辑与当前代码中的定义一致 + private void reCreateNoteTableTriggers(SQLiteDatabase db) { + db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update"); + db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update"); + db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_delete"); + db.execSQL("DROP TRIGGER IF EXISTS delete_data_on_delete"); + db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_insert"); + db.execSQL("DROP TRIGGER IF EXISTS folder_delete_notes_on_delete"); + db.execSQL("DROP TRIGGER IF EXISTS folder_move_notes_on_trash"); + + db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER); + db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER); + db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER); + db.execSQL(NOTE_DELETE_DATA_ON_DELETE_TRIGGER); + db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER); + db.execSQL(FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER); + db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER); + } + + // 在数据库中创建系统文件夹记录，通过向"note"表插入相应的记录来创建不同用途的系统文件夹，如通话记录文件夹、根文件夹、临时文件夹和回收站文件夹等 + private void createSystemFolder(SQLiteDatabase db) { + ContentValues values = new ContentValues(); + + /** + * 创建通话记录文件夹记录，设置文件夹的ID、类型等属性值，然后插入到"note"表中。 + */ + values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER); + values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); + db.insert(TABLE.NOTE, null, values); + + /** + * 创建根文件夹记录，根文件夹是默认文件夹，同样设置相关属性值后插入到"note"表中。 + */ + values.clear(); + values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER); + values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); + db.insert(TABLE.NOTE, null, values); + + /** + * 创建临时文件夹记录，用于临时存放笔记等情况，设置属性值后插入到"note"表中。 + */ + values.clear(); + values.put(NoteColumns.ID, Notes.ID_TEMPAR \ No newline at end of file diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/Notesmaster/app/src/main/java/net/micode/notes/data/NotesProvider.java new file mode 100644 index 0000000..bd0e580 --- /dev/null +++ b/src/Notesmaster/app/src/main/java/net/micode/notes/data/NotesProvider.java @@ -0,0 +1,287 @@ +/* + * Copyright (c) 2010 - 2011, The MiCode Open Source Community (www.micode.net) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE 2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.micode.notes.data; + +import android.app.SearchManager; +import android.content.ContentProvider; +import android.content.ContentUris; +import android.content.ContentValues; +import android.content.Intent; +import android.content.UriMatcher; +import android.database.Cursor; +import android.database.sqlite.SQLiteDatabase; +import android.net.Uri; +import android.text.TextUtils; +import android.util.Log; + +import net.micode.notes.R; +import net.micode.notes.data.Notes.DataColumns; +import net.micode.notes.data.Notes.NoteColumns; +import net.micode.notes.data.NotesDatabaseHelper.TABLE; + +// NotesProvider类继承自ContentProvider，用于在Android应用中作为内容提供器，对外提供对笔记相关数据的增删改查等操作接口， +// 使得不同的应用组件（如Activity、Service等）可以通过统一的内容提供器机制来访问和操作笔记数据。 +public class NotesProvider extends ContentProvider { + + // UriMatcher用于匹配传入的Uri，根据不同的Uri模式确定对应的操作类型，方便在后续的方法中根据匹配结果执行相应逻辑。 + private static final UriMatcher mMatcher; + + // 用于辅助操作数据库，管理数据库的创建、升级以及获取数据库实例等操作，是与数据库交互的关键辅助类。 + private NotesDatabaseHelper mHelper; + + // 用于日志输出的标签，方便在日志中识别该类相关的操作信息，便于调试和问题排查。 + private static final String TAG = "NotesProvider"; + + // 定义不同的常量表示不同的Uri匹配模式，对应不同的笔记数据相关的资源路径，方便在UriMatcher中进行匹配和区分。 + private static final int URI_NOTE = 1; + private static final int URI_NOTE_ITEM = 2; + private static final int URI_DATA = 3; + private static final int URI_DATA_ITEM = 4; + private static final int URI_SEARCH = 5; + private static final int URI_SEARCH_SUGGEST = 6; + + // 静态代码块，用于初始化UriMatcher，添加各种不同的Uri模式及其对应的匹配码，以便后续根据传入的Uri准确识别操作意图。 + static { + mMatcher = new UriMatcher(UriMatcher.NO_MATCH); + mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE); + mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM); + mMatcher.addURI(Notes.AUTHORITY, "data", URI_DATA); + mMatcher.addURI(Notes.AUTHORITY, "data/#", URI_DATA_ITEM); + mMatcher.addURI(Notes.AUTHORITY, "search", URI_SEARCH); + mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY, URI_SEARCH_SUGGEST); + mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", URI_SEARCH_SUGGEST); + } + + /** + * 在SQLite中，x'0A'表示'\n'字符。对于搜索结果中的标题和内容， + * 为了展示更多信息，将会去除'\n'以及空白字符。 + * 以下定义了搜索笔记时的投影（Projection）字符串，用于指定查询结果要返回的列以及对列进行一些处理（如别名设置等）， + * 这些列将用于构建符合搜索建议格式的数据，方便展示给用户。 + */ + private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + "," + + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + "," + + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + "," + + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 + "," + + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + "," + + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + "," + + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA; + + // 定义搜索笔记摘要（Snippet）的查询语句，用于从"note"表中查询符合搜索条件的笔记数据， + // 筛选条件包括根据摘要进行模糊匹配、排除回收站文件夹中的笔记以及只查询类型为普通笔记（非系统文件夹等）的记录。 + private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION + + " FROM " + TABLE.NOTE + + " WHERE " + NoteColumns.SNIPPET + " LIKE?" + + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER + + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE; + + // 在内容提供器创建时被调用，用于初始化操作，这里获取NotesDatabaseHelper的单例实例，为后续数据库操作做准备，返回true表示初始化成功。 + @Override + public boolean onCreate() { + mHelper = NotesDatabaseHelper.getInstance(getContext()); + return true; + } + + // 根据传入的Uri、查询投影、选择条件、选择参数以及排序顺序等信息，执行数据库查询操作，并返回查询结果游标（Cursor）， + // 根据不同的Uri匹配模式，会在不同的数据库表（如"note"表或"data"表）中进行相应的查询逻辑。 + @Override + public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, + String sortOrder) { + Cursor c = null; + SQLiteDatabase db = mHelper.getReadableDatabase(); + String id = null; + switch (mMatcher.match(uri)) { + // 如果匹配到的是查询所有笔记的Uri模式（URI_NOTE），则直接在"note"表中执行查询操作，使用传入的投影、选择条件等参数。 + case URI_NOTE: + c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null, + sortOrder); + break; + // 如果匹配到的是查询单个笔记的Uri模式（URI_NOTE_ITEM），先从Uri中获取笔记的ID，然后在"note"表中根据该ID进行精确查询， + // 同时结合传入的其他选择条件进行进一步筛选。 + case URI_NOTE_ITEM: + id = uri.getPathSegments().get(1); + c = db.query(TABLE.NOTE, projection, NoteColumns.ID + "=" + id + + parseSelection(selection), selectionArgs, null, null, sortOrder); + break; + // 如果匹配到的是查询所有数据的Uri模式（URI_DATA），则在"data"表中执行查询操作，使用传入的相应参数。 + case URI_DATA: + c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null, + sortOrder); + break; + // 如果匹配到的是查询单个数据项的Uri模式（URI_DATA_ITEM），先获取数据项的ID，然后在"data"表中根据该ID进行精确查询， + // 同样结合其他传入的选择条件进行筛选。 + case URI_DATA_ITEM: + id = uri.getPathSegments().get(1); + c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id + + parseSelection(selection), selectionArgs, null, null, sortOrder); + break; + // 如果匹配到的是搜索相关的Uri模式（URI_SEARCH或URI_SEARCH_SUGGEST），进行搜索相关的查询逻辑处理，如下： + case URI_SEARCH: + case URI_SEARCH_SUGGEST: + // 如果传入了排序顺序或者查询投影等特定参数，抛出异常，因为对于搜索操作不应该指定这些参数。 + if (sortOrder!= null || projection!= null) { + throw new IllegalArgumentException( + "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query"); + } + + String searchString = null; + // 根据具体匹配的是搜索建议（URI_SEARCH_SUGGEST）还是普通搜索（URI_SEARCH），从不同的地方获取搜索字符串， + // 如果是搜索建议且Uri路径段数量大于1，则从路径段中获取搜索字符串，否则从查询参数中获取。 + if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) { + if (uri.getPathSegments().size() > 1) { + searchString = uri.getPathSegments().get(1); + } + } else { + searchString = uri.getQueryParameter("pattern"); + } + + // 如果搜索字符串为空，则直接返回null，表示没有有效的搜索内容。 + if (TextUtils.isEmpty(searchString)) { + return null; + } + + try { + // 对搜索字符串进行格式化，添加通配符用于模糊匹配，然后使用格式化后的字符串在数据库中执行原始查询（rawQuery）， + // 查询符合条件的笔记数据，查询语句使用之前定义的NOTES_SNIPPET_SEARCH_QUERY。 + searchString = String.format("%%%s%%", searchString); + c = db.rawQuery(NOTES_SNIPPET_SEARCH_QUERY, + new String[] { searchString }); + } catch (IllegalStateException ex) { + // 如果在执行查询过程中出现异常，记录错误日志。 + Log.e(TAG, "got exception: " + ex.toString()); + } + break; + default: + // 如果传入的Uri不匹配任何已知的模式，抛出异常表示未知的Uri。 + throw new IllegalArgumentException("Unknown URI " + uri); + } + // 如果查询结果游标不为空，设置其通知Uri，以便在数据发生变化时能够接收到相应的通知更新。 + if (c!= null) { + c.setNotificationUri(getContext().getContentResolver(), uri); + } + return c; + } + + // 根据传入的Uri和要插入的内容值（ContentValues），向数据库中插入相应的数据记录， + // 根据不同的Uri匹配模式，确定是向"note"表还是"data"表插入数据，并返回插入后记录对应的Uri，同时发送数据变化通知。 + @Override + public Uri insert(Uri uri, ContentValues values) { + SQLiteDatabase db = mHelper.getWritableDatabase(); + long dataId = 0, noteId = 0, insertedId = 0; + switch (mMatcher.match(uri)) { + // 如果匹配到的是向笔记表插入的Uri模式（URI_NOTE），则直接向"note"表插入数据，获取插入记录的ID。 + case URI_NOTE: + insertedId = noteId = db.insert(TABLE.NOTE, null, values); + break; + // 如果匹配到的是向数据表插入的Uri模式（URI_DATA），先获取笔记ID（如果存在），然后向"data"表插入数据，获取插入记录的ID。 + case URI_DATA: + if (values.containsKey(DataColumns.NOTE_ID)) { + noteId = values.getAsLong(DataColumns.NOTE_ID); + } else { + Log.d(TAG, "Wrong data format without note id:" + values.toString()); + } + insertedId = dataId = db.insert(TABLE.DATA, null, values); + break; + default: + // 如果Uri不匹配已知的插入模式，抛出异常表示未知的Uri。 + throw new IllegalArgumentException("Unknown URI " + uri); + } + // 如果插入的是笔记记录且插入成功（笔记ID大于0），发送笔记Uri的内容变化通知，以便相关组件能及时更新数据显示等操作。 + if (noteId > 0) { + getContext().getContentResolver().notifyChange( + ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null); + } + + // 如果插入的是数据记录且插入成功（数据ID大于0），发送数据Uri的内容变化通知。 + if (dataId > 0) { + getContext().getContentResolver().notifyChange( + ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null); + } + + // 返回插入记录对应的Uri，通过在原始Uri上附加插入记录的ID构建而成。 + return ContentUris.withAppendedId(uri, insertedId); + } + + // 根据传入的Uri、删除条件以及删除条件参数，从数据库中删除相应的数据记录，根据不同的Uri匹配模式确定要删除的表和具体记录， + // 同时根据删除操作的结果发送相应的内容变化通知，并返回删除的记录数量。 + @Override + public int delete(Uri uri, String selection, String[] selectionArgs) { + int count = 0; + String id = null; + SQLiteDatabase db = mHelper.getWritableDatabase(); + boolean deleteData = false; + switch (mMatcher.match(uri)) { + // 如果匹配到的是删除所有笔记的Uri模式（URI_NOTE），对删除条件进行补充（确保ID大于0），然后在"note"表中执行删除操作，获取删除的记录数量。 + case URI_NOTE: + selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 "; + count = db.delete(TABLE.NOTE, selection, selectionArgs); + break; + // 如果匹配到的是删除单个笔记的Uri模式（URI_NOTE_ITEM），先获取笔记的ID，然后判断笔记ID是否小于等于0（系统文件夹不允许删除）， + // 如果大于0则在"note"表中根据该ID以及其他删除条件执行删除操作，获取删除记录数量。 + case URI_NOTE_ITEM: + id = uri.getPathSegments().get(1); + /** + * ID that smaller than 0 is system folder which is not allowed to + * trash + */ + long noteId = Long.valueOf(id); + if (noteId <= 0) { + break; + } + count = db.delete(TABLE.NOTE, + NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs); + break; + // 如果匹配到的是删除所有数据的Uri模式（URI_DATA），直接在"data"表中执行删除操作，设置标记表示删除的是数据记录，获取删除记录数量。 + case URI_DATA: + count = db.delete(TABLE.DATA, selection, selectionArgs); + deleteData = true; + break; + // 如果匹配到的是删除单个数据项的Uri模式（URI_DATA_ITEM），先获取数据项的ID，然后在"data"表中根据该ID以及其他删除条件执行删除操作， + // 设置标记表示删除的是数据记录，获取删除记录数量。 + case URI_DATA_ITEM: + id = uri.getPathSegments().get(1); + count = db.delete(TABLE.DATA, + DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs); + deleteData = true; + break; + default: + // 如果传入的Uri不匹配任何已知的删除模式，抛出异常表示未知的Uri。 + throw new IllegalArgumentException("Unknown URI " + uri); + } + if (count > 0) { + // 如果删除了数据记录（deleteData为true），发送笔记内容Uri的变化通知，因为数据变化可能影响到相关笔记的展示等情况。 + if (deleteData) { + getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null); + } + // 发送当前操作的Uri对应的内容变化通知，以便相关组件能及时更新数据显示等操作。 + getContext().getContentResolver().notifyChange(uri, null); + } + return count; + } + + // 根据传入的Uri、要更新的内容值、更新条件以及更新条件参数，对数据库中的相应数据记录进行更新操作， + // 根据不同的Uri匹配模式确定要更新的表和具体记录，同时根据更新操作的结果发送相应的内容变化通知，并返回更新的记录数量。 + @Override + public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { + int count = 0; + String id = null; + SQLiteDatabase db = mHelper.getWritableDatabase(); + boolean updateData = false; + switch (mMatcher.match(uri)) { + // 如果匹配到的是更新所有笔记的Uri模式（URI_NOTE），先调用increaseNoteVersion方法增加笔记版本号（可能用于数据同步等逻辑）， + // 然后在"note"表中执行更新操作，获取更新的记录数量。 + case URI_NOTE: + increaseNoteVersion(-1, \ No newline at end of file diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/MetaData.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/data/MetaData.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/MetaData.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/Node.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/data/Node.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/Node.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/SqlData.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/data/SqlData.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/SqlData.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/Task.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/data/Task.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/Task.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/TaskList.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/data/TaskList.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/TaskList.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java similarity index 82% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java index 89e5c2d..2913be0 100644 --- a/src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java +++ b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java @@ -64,6 +64,25 @@ public class GTaskASyncTask extends AsyncTask { }); } +// private void showNotification(int tickerId, String content) { +// Notification notification = new Notification(R.drawable.notification, mContext +// .getString(tickerId), System.currentTimeMillis()); +// notification.defaults = Notification.DEFAULT_LIGHTS; +// notification.flags = Notification.FLAG_AUTO_CANCEL; +// PendingIntent pendingIntent; +// if (tickerId != R.string.ticker_success) { +// pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, +// NotesPreferenceActivity.class), 0); +// +// } else { +// pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, +// NotesListActivity.class), 0); +// } +// notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content, +// pendingIntent); +// mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); +// } + @SuppressLint("NotificationPermission") private void showNotification(int tickerId, String content) { PendingIntent pendingIntent; @@ -85,6 +104,7 @@ public class GTaskASyncTask extends AsyncTask { mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); } + @Override protected Integer doInBackground(Void... unused) { publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/model/Note.java b/src/Notesmaster/app/src/main/java/net/micode/notes/model/Note.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/model/Note.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/model/Note.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/Notesmaster/app/src/main/java/net/micode/notes/model/WorkingNote.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/model/WorkingNote.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/model/WorkingNote.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/Notesmaster/app/src/main/java/net/micode/notes/tool/BackupUtils.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/tool/BackupUtils.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/tool/BackupUtils.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/Notesmaster/app/src/main/java/net/micode/notes/tool/DataUtils.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/tool/DataUtils.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/tool/DataUtils.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/src/Notesmaster/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/Notesmaster/app/src/main/java/net/micode/notes/tool/ResourceParser.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/tool/ResourceParser.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/tool/ResourceParser.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/DateTimePicker.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/ui/DateTimePicker.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/ui/DateTimePicker.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/DropdownMenu.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/ui/DropdownMenu.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/ui/DropdownMenu.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/NoteEditText.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/ui/NoteEditText.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/ui/NoteEditText.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/NoteItemData.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/ui/NoteItemData.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/ui/NoteItemData.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/NotesListActivity.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/ui/NotesListActivity.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/ui/NotesListActivity.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/NotesListItem.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/ui/NotesListItem.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/ui/NotesListItem.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/Notesmaster/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/Notesmaster/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/Notesmaster/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java similarity index 100% rename from src/Notesmaster2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java rename to src/Notesmaster/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java diff --git a/src/Notesmaster2/app/src/main/res/color/primary_text_dark.xml b/src/Notesmaster/app/src/main/res/color/primary_text_dark.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/color/primary_text_dark.xml rename to src/Notesmaster/app/src/main/res/color/primary_text_dark.xml diff --git a/src/Notesmaster2/app/src/main/res/color/secondary_text_dark.xml b/src/Notesmaster/app/src/main/res/color/secondary_text_dark.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/color/secondary_text_dark.xml rename to src/Notesmaster/app/src/main/res/color/secondary_text_dark.xml diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/bg_btn_set_color.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/bg_btn_set_color.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/bg_btn_set_color.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/bg_btn_set_color.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/call_record.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/call_record.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/call_record.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/call_record.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/clock.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/clock.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/clock.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/clock.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/delete.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/delete.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/delete.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/delete.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/dropdown_icon.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/dropdown_icon.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/dropdown_icon.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_blue.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/edit_blue.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_blue.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/edit_blue.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_green.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/edit_green.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_green.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/edit_green.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_red.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/edit_red.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_red.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/edit_red.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_title_blue.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/edit_title_blue.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_title_blue.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/edit_title_blue.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_title_green.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/edit_title_green.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_title_green.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/edit_title_green.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_title_red.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/edit_title_red.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_title_red.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/edit_title_red.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_title_white.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/edit_title_white.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_title_white.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/edit_title_white.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_white.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/edit_white.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_white.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/edit_white.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/edit_yellow.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/edit_yellow.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/edit_yellow.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/font_large.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/font_large.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/font_large.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/font_large.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/font_normal.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/font_normal.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/font_normal.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/font_normal.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/font_small.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/font_small.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/font_small.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/font_small.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/font_super.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/font_super.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/font_super.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/font_super.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/icon_app.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/icon_app.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/icon_app.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/icon_app.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_background.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_background.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_background.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_background.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_blue_down.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_blue_down.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_blue_down.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_blue_down.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_blue_middle.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_blue_middle.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_blue_middle.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_blue_middle.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_blue_single.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_blue_single.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_blue_single.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_blue_single.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_blue_up.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_blue_up.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_blue_up.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_blue_up.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_folder.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_folder.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_folder.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_folder.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_footer_bg.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_footer_bg.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_footer_bg.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_footer_bg.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_green_down.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_green_down.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_green_down.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_green_down.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_green_middle.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_green_middle.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_green_middle.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_green_middle.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_green_single.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_green_single.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_green_single.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_green_single.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_green_up.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_green_up.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_green_up.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_green_up.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_red_down.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_red_down.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_red_down.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_red_down.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_red_middle.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_red_middle.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_red_middle.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_red_middle.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_red_single.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_red_single.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_red_single.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_red_single.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_red_up.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_red_up.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_red_up.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_red_up.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_white_down.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_white_down.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_white_down.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_white_down.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_white_middle.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_white_middle.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_white_middle.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_white_middle.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_white_single.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_white_single.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_white_single.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_white_single.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_white_up.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_white_up.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_white_up.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_white_up.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_yellow_down.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_yellow_down.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_yellow_down.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_yellow_down.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_yellow_single.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_yellow_single.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_yellow_single.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_yellow_single.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/list_yellow_up.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/list_yellow_up.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/list_yellow_up.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/list_yellow_up.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/menu_delete.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/menu_delete.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/menu_delete.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/menu_delete.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/menu_move.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/menu_move.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/menu_move.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/menu_move.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/new_note_normal.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/new_note_normal.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/new_note_normal.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/new_note_normal.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/new_note_pressed.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/new_note_pressed.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/new_note_pressed.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/new_note_pressed.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/notification.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/notification.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/notification.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/notification.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/search_result.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/search_result.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/search_result.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/search_result.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/selected.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/selected.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/selected.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/selected.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/title_alert.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/title_alert.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/title_alert.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/title_alert.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/title_bar_bg.9.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/title_bar_bg.9.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/title_bar_bg.9.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/title_bar_bg.9.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_2x_blue.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/widget_2x_blue.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_2x_blue.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/widget_2x_blue.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_2x_green.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/widget_2x_green.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_2x_green.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/widget_2x_green.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_2x_red.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/widget_2x_red.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_2x_red.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/widget_2x_red.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_2x_white.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/widget_2x_white.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_2x_white.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/widget_2x_white.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_2x_yellow.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/widget_2x_yellow.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_2x_yellow.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/widget_2x_yellow.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_4x_blue.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/widget_4x_blue.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_4x_blue.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/widget_4x_blue.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_4x_green.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/widget_4x_green.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_4x_green.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/widget_4x_green.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_4x_red.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/widget_4x_red.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_4x_red.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/widget_4x_red.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_4x_white.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/widget_4x_white.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_4x_white.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/widget_4x_white.png diff --git a/src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_4x_yellow.png b/src/Notesmaster/app/src/main/res/drawable-hdpi/widget_4x_yellow.png similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable-hdpi/widget_4x_yellow.png rename to src/Notesmaster/app/src/main/res/drawable-hdpi/widget_4x_yellow.png diff --git a/src/Notesmaster2/app/src/main/res/drawable/ic_launcher_background.xml b/src/Notesmaster/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable/ic_launcher_background.xml rename to src/Notesmaster/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/src/Notesmaster2/app/src/main/res/drawable/ic_launcher_foreground.xml b/src/Notesmaster/app/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable/ic_launcher_foreground.xml rename to src/Notesmaster/app/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/src/Notesmaster2/app/src/main/res/drawable/new_note.xml b/src/Notesmaster/app/src/main/res/drawable/new_note.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/drawable/new_note.xml rename to src/Notesmaster/app/src/main/res/drawable/new_note.xml diff --git a/src/Notesmaster2/app/src/main/res/layout/account_dialog_title.xml b/src/Notesmaster/app/src/main/res/layout/account_dialog_title.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/layout/account_dialog_title.xml rename to src/Notesmaster/app/src/main/res/layout/account_dialog_title.xml diff --git a/src/Notesmaster2/app/src/main/res/layout/activity_main.xml b/src/Notesmaster/app/src/main/res/layout/activity_main.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/layout/activity_main.xml rename to src/Notesmaster/app/src/main/res/layout/activity_main.xml diff --git a/src/Notesmaster2/app/src/main/res/layout/add_account_text.xml b/src/Notesmaster/app/src/main/res/layout/add_account_text.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/layout/add_account_text.xml rename to src/Notesmaster/app/src/main/res/layout/add_account_text.xml diff --git a/src/Notesmaster2/app/src/main/res/layout/datetime_picker.xml b/src/Notesmaster/app/src/main/res/layout/datetime_picker.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/layout/datetime_picker.xml rename to src/Notesmaster/app/src/main/res/layout/datetime_picker.xml diff --git a/src/Notesmaster2/app/src/main/res/layout/dialog_edit_text.xml b/src/Notesmaster/app/src/main/res/layout/dialog_edit_text.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/layout/dialog_edit_text.xml rename to src/Notesmaster/app/src/main/res/layout/dialog_edit_text.xml diff --git a/src/Notesmaster2/app/src/main/res/layout/folder_list_item.xml b/src/Notesmaster/app/src/main/res/layout/folder_list_item.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/layout/folder_list_item.xml rename to src/Notesmaster/app/src/main/res/layout/folder_list_item.xml diff --git a/src/Notesmaster2/app/src/main/res/layout/note_edit.xml b/src/Notesmaster/app/src/main/res/layout/note_edit.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/layout/note_edit.xml rename to src/Notesmaster/app/src/main/res/layout/note_edit.xml diff --git a/src/Notesmaster2/app/src/main/res/layout/note_edit_list_item.xml b/src/Notesmaster/app/src/main/res/layout/note_edit_list_item.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/layout/note_edit_list_item.xml rename to src/Notesmaster/app/src/main/res/layout/note_edit_list_item.xml diff --git a/src/Notesmaster2/app/src/main/res/layout/note_item.xml b/src/Notesmaster/app/src/main/res/layout/note_item.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/layout/note_item.xml rename to src/Notesmaster/app/src/main/res/layout/note_item.xml diff --git a/src/Notesmaster2/app/src/main/res/layout/note_list.xml b/src/Notesmaster/app/src/main/res/layout/note_list.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/layout/note_list.xml rename to src/Notesmaster/app/src/main/res/layout/note_list.xml diff --git a/src/Notesmaster2/app/src/main/res/layout/note_list_dropdown_menu.xml b/src/Notesmaster/app/src/main/res/layout/note_list_dropdown_menu.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/layout/note_list_dropdown_menu.xml rename to src/Notesmaster/app/src/main/res/layout/note_list_dropdown_menu.xml diff --git a/src/Notesmaster2/app/src/main/res/layout/note_list_footer.xml b/src/Notesmaster/app/src/main/res/layout/note_list_footer.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/layout/note_list_footer.xml rename to src/Notesmaster/app/src/main/res/layout/note_list_footer.xml diff --git a/src/Notesmaster2/app/src/main/res/layout/settings_header.xml b/src/Notesmaster/app/src/main/res/layout/settings_header.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/layout/settings_header.xml rename to src/Notesmaster/app/src/main/res/layout/settings_header.xml diff --git a/src/Notesmaster2/app/src/main/res/layout/widget_2x.xml b/src/Notesmaster/app/src/main/res/layout/widget_2x.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/layout/widget_2x.xml rename to src/Notesmaster/app/src/main/res/layout/widget_2x.xml diff --git a/src/Notesmaster2/app/src/main/res/layout/widget_4x.xml b/src/Notesmaster/app/src/main/res/layout/widget_4x.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/layout/widget_4x.xml rename to src/Notesmaster/app/src/main/res/layout/widget_4x.xml diff --git a/src/Notesmaster2/app/src/main/res/menu/call_note_edit.xml b/src/Notesmaster/app/src/main/res/menu/call_note_edit.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/menu/call_note_edit.xml rename to src/Notesmaster/app/src/main/res/menu/call_note_edit.xml diff --git a/src/Notesmaster2/app/src/main/res/menu/call_record_folder.xml b/src/Notesmaster/app/src/main/res/menu/call_record_folder.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/menu/call_record_folder.xml rename to src/Notesmaster/app/src/main/res/menu/call_record_folder.xml diff --git a/src/Notesmaster2/app/src/main/res/menu/note_edit.xml b/src/Notesmaster/app/src/main/res/menu/note_edit.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/menu/note_edit.xml rename to src/Notesmaster/app/src/main/res/menu/note_edit.xml diff --git a/src/Notesmaster2/app/src/main/res/menu/note_list.xml b/src/Notesmaster/app/src/main/res/menu/note_list.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/menu/note_list.xml rename to src/Notesmaster/app/src/main/res/menu/note_list.xml diff --git a/src/Notesmaster2/app/src/main/res/menu/note_list_dropdown.xml b/src/Notesmaster/app/src/main/res/menu/note_list_dropdown.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/menu/note_list_dropdown.xml rename to src/Notesmaster/app/src/main/res/menu/note_list_dropdown.xml diff --git a/src/Notesmaster2/app/src/main/res/menu/note_list_options.xml b/src/Notesmaster/app/src/main/res/menu/note_list_options.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/menu/note_list_options.xml rename to src/Notesmaster/app/src/main/res/menu/note_list_options.xml diff --git a/src/Notesmaster2/app/src/main/res/menu/sub_folder.xml b/src/Notesmaster/app/src/main/res/menu/sub_folder.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/menu/sub_folder.xml rename to src/Notesmaster/app/src/main/res/menu/sub_folder.xml diff --git a/src/Notesmaster2/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/src/Notesmaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to src/Notesmaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/src/Notesmaster2/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/src/Notesmaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to src/Notesmaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/src/Notesmaster2/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/src/Notesmaster/app/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from src/Notesmaster2/app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to src/Notesmaster/app/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/src/Notesmaster2/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/src/Notesmaster/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from src/Notesmaster2/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to src/Notesmaster/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/src/Notesmaster2/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/src/Notesmaster/app/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from src/Notesmaster2/app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to src/Notesmaster/app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/src/Notesmaster2/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/src/Notesmaster/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from src/Notesmaster2/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to src/Notesmaster/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/src/Notesmaster2/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/src/Notesmaster/app/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from src/Notesmaster2/app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to src/Notesmaster/app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/src/Notesmaster2/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/src/Notesmaster/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from src/Notesmaster2/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to src/Notesmaster/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/src/Notesmaster2/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/src/Notesmaster/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from src/Notesmaster2/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to src/Notesmaster/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/src/Notesmaster2/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/src/Notesmaster/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from src/Notesmaster2/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to src/Notesmaster/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/src/Notesmaster2/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/src/Notesmaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from src/Notesmaster2/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to src/Notesmaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/src/Notesmaster2/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/src/Notesmaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from src/Notesmaster2/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to src/Notesmaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/src/Notesmaster2/app/src/main/res/raw-zh-rCN/introduction b/src/Notesmaster/app/src/main/res/raw-zh-rCN/introduction similarity index 100% rename from src/Notesmaster2/app/src/main/res/raw-zh-rCN/introduction rename to src/Notesmaster/app/src/main/res/raw-zh-rCN/introduction diff --git a/src/Notesmaster2/app/src/main/res/raw/introduction b/src/Notesmaster/app/src/main/res/raw/introduction similarity index 100% rename from src/Notesmaster2/app/src/main/res/raw/introduction rename to src/Notesmaster/app/src/main/res/raw/introduction diff --git a/src/Notesmaster2/app/src/main/res/values-night/themes.xml b/src/Notesmaster/app/src/main/res/values-night/themes.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/values-night/themes.xml rename to src/Notesmaster/app/src/main/res/values-night/themes.xml diff --git a/src/Notesmaster2/app/src/main/res/values-zh-rCN/arrays.xml b/src/Notesmaster/app/src/main/res/values-zh-rCN/arrays.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/values-zh-rCN/arrays.xml rename to src/Notesmaster/app/src/main/res/values-zh-rCN/arrays.xml diff --git a/src/Notesmaster2/app/src/main/res/values-zh-rCN/strings.xml b/src/Notesmaster/app/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/values-zh-rCN/strings.xml rename to src/Notesmaster/app/src/main/res/values-zh-rCN/strings.xml diff --git a/src/Notesmaster2/app/src/main/res/values-zh-rTW/arrays.xml b/src/Notesmaster/app/src/main/res/values-zh-rTW/arrays.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/values-zh-rTW/arrays.xml rename to src/Notesmaster/app/src/main/res/values-zh-rTW/arrays.xml diff --git a/src/Notesmaster2/app/src/main/res/values-zh-rTW/strings.xml b/src/Notesmaster/app/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/values-zh-rTW/strings.xml rename to src/Notesmaster/app/src/main/res/values-zh-rTW/strings.xml diff --git a/src/Notesmaster2/app/src/main/res/values/arrays.xml b/src/Notesmaster/app/src/main/res/values/arrays.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/values/arrays.xml rename to src/Notesmaster/app/src/main/res/values/arrays.xml diff --git a/src/Notesmaster2/app/src/main/res/values/colors.xml b/src/Notesmaster/app/src/main/res/values/colors.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/values/colors.xml rename to src/Notesmaster/app/src/main/res/values/colors.xml diff --git a/src/Notesmaster2/app/src/main/res/values/dimens.xml b/src/Notesmaster/app/src/main/res/values/dimens.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/values/dimens.xml rename to src/Notesmaster/app/src/main/res/values/dimens.xml diff --git a/src/Notesmaster2/app/src/main/res/values/strings.xml b/src/Notesmaster/app/src/main/res/values/strings.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/values/strings.xml rename to src/Notesmaster/app/src/main/res/values/strings.xml diff --git a/src/Notesmaster2/app/src/main/res/values/styles.xml b/src/Notesmaster/app/src/main/res/values/styles.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/values/styles.xml rename to src/Notesmaster/app/src/main/res/values/styles.xml diff --git a/src/Notesmaster2/app/src/main/res/values/themes.xml b/src/Notesmaster/app/src/main/res/values/themes.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/values/themes.xml rename to src/Notesmaster/app/src/main/res/values/themes.xml diff --git a/src/Notesmaster2/app/src/main/res/xml/backup_rules.xml b/src/Notesmaster/app/src/main/res/xml/backup_rules.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/xml/backup_rules.xml rename to src/Notesmaster/app/src/main/res/xml/backup_rules.xml diff --git a/src/Notesmaster2/app/src/main/res/xml/data_extraction_rules.xml b/src/Notesmaster/app/src/main/res/xml/data_extraction_rules.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/xml/data_extraction_rules.xml rename to src/Notesmaster/app/src/main/res/xml/data_extraction_rules.xml diff --git a/src/Notesmaster2/app/src/main/res/xml/preferences.xml b/src/Notesmaster/app/src/main/res/xml/preferences.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/xml/preferences.xml rename to src/Notesmaster/app/src/main/res/xml/preferences.xml diff --git a/src/Notesmaster2/app/src/main/res/xml/searchable.xml b/src/Notesmaster/app/src/main/res/xml/searchable.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/xml/searchable.xml rename to src/Notesmaster/app/src/main/res/xml/searchable.xml diff --git a/src/Notesmaster2/app/src/main/res/xml/widget_2x_info.xml b/src/Notesmaster/app/src/main/res/xml/widget_2x_info.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/xml/widget_2x_info.xml rename to src/Notesmaster/app/src/main/res/xml/widget_2x_info.xml diff --git a/src/Notesmaster2/app/src/main/res/xml/widget_4x_info.xml b/src/Notesmaster/app/src/main/res/xml/widget_4x_info.xml similarity index 100% rename from src/Notesmaster2/app/src/main/res/xml/widget_4x_info.xml rename to src/Notesmaster/app/src/main/res/xml/widget_4x_info.xml diff --git a/src/Notesmaster2/app/src/test/java/net/micode/notes/ExampleUnitTest.java b/src/Notesmaster/app/src/test/java/net/micode/notes/ExampleUnitTest.java similarity index 100% rename from src/Notesmaster2/app/src/test/java/net/micode/notes/ExampleUnitTest.java rename to src/Notesmaster/app/src/test/java/net/micode/notes/ExampleUnitTest.java diff --git a/src/Notesmaster2/build.gradle.kts b/src/Notesmaster/build.gradle.kts similarity index 100% rename from src/Notesmaster2/build.gradle.kts rename to src/Notesmaster/build.gradle.kts diff --git a/src/Notesmaster2/gradle.properties b/src/Notesmaster/gradle.properties similarity index 97% rename from src/Notesmaster2/gradle.properties rename to src/Notesmaster/gradle.properties index fd5ffa1..00d252e 100644 --- a/src/Notesmaster2/gradle.properties +++ b/src/Notesmaster/gradle.properties @@ -19,4 +19,4 @@ android.useAndroidX=true # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true -android.nonFinalResIds=false +android.nonFinalResIds=false \ No newline at end of file diff --git a/src/Notesmaster2/gradle/libs.versions.toml b/src/Notesmaster/gradle/libs.versions.toml similarity index 100% rename from src/Notesmaster2/gradle/libs.versions.toml rename to src/Notesmaster/gradle/libs.versions.toml diff --git a/src/Notesmaster2/gradle/wrapper/gradle-wrapper.jar b/src/Notesmaster/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from src/Notesmaster2/gradle/wrapper/gradle-wrapper.jar rename to src/Notesmaster/gradle/wrapper/gradle-wrapper.jar diff --git a/src/Notesmaster2/gradle/wrapper/gradle-wrapper.properties b/src/Notesmaster/gradle/wrapper/gradle-wrapper.properties similarity index 86% rename from src/Notesmaster2/gradle/wrapper/gradle-wrapper.properties rename to src/Notesmaster/gradle/wrapper/gradle-wrapper.properties index ef51f73..5b53162 100644 --- a/src/Notesmaster2/gradle/wrapper/gradle-wrapper.properties +++ b/src/Notesmaster/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Wed Dec 04 11:25:13 CST 2024 +#Fri Nov 29 19:15:54 CST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip diff --git a/src/Notesmaster2/gradlew b/src/Notesmaster/gradlew similarity index 100% rename from src/Notesmaster2/gradlew rename to src/Notesmaster/gradlew diff --git a/src/Notesmaster2/gradlew.bat b/src/Notesmaster/gradlew.bat similarity index 100% rename from src/Notesmaster2/gradlew.bat rename to src/Notesmaster/gradlew.bat diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/LICENSE.txt b/src/Notesmaster/httpcomponents-client-4.5.14-bin/LICENSE.txt similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/LICENSE.txt rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/LICENSE.txt diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/NOTICE.txt b/src/Notesmaster/httpcomponents-client-4.5.14-bin/NOTICE.txt similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/NOTICE.txt rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/NOTICE.txt diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/RELEASE_NOTES.txt b/src/Notesmaster/httpcomponents-client-4.5.14-bin/RELEASE_NOTES.txt similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/RELEASE_NOTES.txt rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/RELEASE_NOTES.txt diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/allclasses-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/allclasses-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/allclasses-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/allclasses-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/allclasses-noframe.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/allclasses-noframe.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/allclasses-noframe.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/allclasses-noframe.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/constant-values.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/constant-values.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/constant-values.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/constant-values.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/deprecated-list.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/deprecated-list.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/deprecated-list.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/deprecated-list.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/help-doc.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/help-doc.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/help-doc.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/help-doc.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/index-all.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/index-all.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/index-all.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/index-all.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/index.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/index.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/index.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/index.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AUTH.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AUTH.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AUTH.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AUTH.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthOption.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthOption.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthOption.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthOption.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthProtocolState.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthProtocolState.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthProtocolState.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthProtocolState.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeRegistry.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeRegistry.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeRegistry.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeRegistry.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthScope.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthScope.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthScope.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthScope.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthState.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthState.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthState.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthState.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthenticationException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthenticationException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthenticationException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthenticationException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/BasicUserPrincipal.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/BasicUserPrincipal.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/BasicUserPrincipal.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/BasicUserPrincipal.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/ChallengeState.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/ChallengeState.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/ChallengeState.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/ChallengeState.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/ContextAwareAuthScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/ContextAwareAuthScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/ContextAwareAuthScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/ContextAwareAuthScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/Credentials.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/Credentials.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/Credentials.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/Credentials.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/InvalidCredentialsException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/InvalidCredentialsException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/InvalidCredentialsException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/InvalidCredentialsException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/KerberosCredentials.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/KerberosCredentials.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/KerberosCredentials.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/KerberosCredentials.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/MalformedChallengeException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/MalformedChallengeException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/MalformedChallengeException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/MalformedChallengeException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/NTCredentials.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/NTCredentials.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/NTCredentials.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/NTCredentials.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/NTUserPrincipal.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/NTUserPrincipal.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/NTUserPrincipal.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/NTUserPrincipal.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/UsernamePasswordCredentials.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/UsernamePasswordCredentials.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/UsernamePasswordCredentials.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/UsernamePasswordCredentials.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AUTH.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AUTH.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AUTH.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AUTH.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthOption.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthOption.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthOption.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthOption.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthProtocolState.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthProtocolState.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthProtocolState.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthProtocolState.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeRegistry.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeRegistry.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeRegistry.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeRegistry.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthScope.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthScope.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthScope.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthScope.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthState.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthState.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthState.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthState.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthenticationException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthenticationException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthenticationException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthenticationException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/BasicUserPrincipal.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/BasicUserPrincipal.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/BasicUserPrincipal.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/BasicUserPrincipal.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/ChallengeState.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/ChallengeState.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/ChallengeState.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/ChallengeState.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/ContextAwareAuthScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/ContextAwareAuthScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/ContextAwareAuthScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/ContextAwareAuthScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/Credentials.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/Credentials.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/Credentials.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/Credentials.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/InvalidCredentialsException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/InvalidCredentialsException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/InvalidCredentialsException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/InvalidCredentialsException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/KerberosCredentials.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/KerberosCredentials.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/KerberosCredentials.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/KerberosCredentials.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/MalformedChallengeException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/MalformedChallengeException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/MalformedChallengeException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/MalformedChallengeException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/NTCredentials.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/NTCredentials.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/NTCredentials.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/NTCredentials.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/NTUserPrincipal.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/NTUserPrincipal.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/NTUserPrincipal.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/NTUserPrincipal.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/UsernamePasswordCredentials.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/UsernamePasswordCredentials.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/UsernamePasswordCredentials.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/UsernamePasswordCredentials.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthPNames.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthPNames.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthPNames.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthPNames.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthParamBean.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthParamBean.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthParamBean.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthParamBean.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthParams.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthParams.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthParams.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthParams.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthPNames.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthPNames.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthPNames.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthPNames.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthParamBean.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthParamBean.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthParamBean.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthParamBean.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthParams.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthParams.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthParams.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthParams.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthCache.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthCache.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthCache.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthCache.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthenticationHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthenticationHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthenticationHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthenticationHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthenticationStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthenticationStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthenticationStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthenticationStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/BackoffManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/BackoffManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/BackoffManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/BackoffManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CircularRedirectException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CircularRedirectException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CircularRedirectException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CircularRedirectException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ClientProtocolException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ClientProtocolException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ClientProtocolException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ClientProtocolException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ConnectionBackoffStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ConnectionBackoffStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ConnectionBackoffStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ConnectionBackoffStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CookieStore.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CookieStore.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CookieStore.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CookieStore.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CredentialsProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CredentialsProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CredentialsProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CredentialsProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpRequestRetryHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpRequestRetryHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpRequestRetryHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpRequestRetryHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpResponseException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpResponseException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpResponseException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpResponseException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/NonRepeatableRequestException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/NonRepeatableRequestException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/NonRepeatableRequestException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/NonRepeatableRequestException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RequestDirector.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RequestDirector.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RequestDirector.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RequestDirector.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ResponseHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ResponseHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ResponseHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ResponseHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ServiceUnavailableRetryStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ServiceUnavailableRetryStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ServiceUnavailableRetryStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ServiceUnavailableRetryStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/UserTokenHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/UserTokenHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/UserTokenHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/UserTokenHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/CacheResponseStatus.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/CacheResponseStatus.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/CacheResponseStatus.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/CacheResponseStatus.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HeaderConstants.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HeaderConstants.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HeaderConstants.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HeaderConstants.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheContext.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheContext.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheContext.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheContext.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntry.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntry.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntry.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntry.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntrySerializationException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntrySerializationException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntrySerializationException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntrySerializationException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntrySerializer.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntrySerializer.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntrySerializer.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntrySerializer.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheInvalidator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheInvalidator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheInvalidator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheInvalidator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheStorage.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheStorage.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheStorage.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheStorage.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheUpdateCallback.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheUpdateCallback.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheUpdateCallback.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheUpdateCallback.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheUpdateException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheUpdateException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheUpdateException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheUpdateException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/InputLimit.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/InputLimit.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/InputLimit.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/InputLimit.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/Resource.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/Resource.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/Resource.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/Resource.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/ResourceFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/ResourceFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/ResourceFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/ResourceFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/CacheResponseStatus.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/CacheResponseStatus.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/CacheResponseStatus.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/CacheResponseStatus.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HeaderConstants.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HeaderConstants.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HeaderConstants.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HeaderConstants.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheContext.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheContext.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheContext.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheContext.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntry.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntry.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntry.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntry.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntrySerializationException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntrySerializationException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntrySerializationException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntrySerializationException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntrySerializer.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntrySerializer.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntrySerializer.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntrySerializer.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheInvalidator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheInvalidator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheInvalidator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheInvalidator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheStorage.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheStorage.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheStorage.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheStorage.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheUpdateCallback.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheUpdateCallback.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheUpdateCallback.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheUpdateCallback.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheUpdateException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheUpdateException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheUpdateException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheUpdateException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/InputLimit.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/InputLimit.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/InputLimit.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/InputLimit.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/Resource.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/Resource.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/Resource.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/Resource.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/ResourceFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/ResourceFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/ResourceFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/ResourceFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthCache.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthCache.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthCache.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthCache.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthenticationHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthenticationHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthenticationHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthenticationHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthenticationStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthenticationStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthenticationStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthenticationStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/BackoffManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/BackoffManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/BackoffManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/BackoffManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CircularRedirectException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CircularRedirectException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CircularRedirectException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CircularRedirectException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ClientProtocolException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ClientProtocolException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ClientProtocolException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ClientProtocolException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ConnectionBackoffStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ConnectionBackoffStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ConnectionBackoffStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ConnectionBackoffStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CookieStore.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CookieStore.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CookieStore.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CookieStore.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CredentialsProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CredentialsProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CredentialsProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CredentialsProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpRequestRetryHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpRequestRetryHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpRequestRetryHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpRequestRetryHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpResponseException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpResponseException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpResponseException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpResponseException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/NonRepeatableRequestException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/NonRepeatableRequestException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/NonRepeatableRequestException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/NonRepeatableRequestException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RequestDirector.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RequestDirector.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RequestDirector.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RequestDirector.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ResponseHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ResponseHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ResponseHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ResponseHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ServiceUnavailableRetryStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ServiceUnavailableRetryStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ServiceUnavailableRetryStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ServiceUnavailableRetryStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/UserTokenHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/UserTokenHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/UserTokenHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/UserTokenHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/AuthSchemes.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/AuthSchemes.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/AuthSchemes.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/AuthSchemes.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/CookieSpecs.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/CookieSpecs.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/CookieSpecs.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/CookieSpecs.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/RequestConfig.Builder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/RequestConfig.Builder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/RequestConfig.Builder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/RequestConfig.Builder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/RequestConfig.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/RequestConfig.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/RequestConfig.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/RequestConfig.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/AuthSchemes.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/AuthSchemes.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/AuthSchemes.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/AuthSchemes.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/CookieSpecs.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/CookieSpecs.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/CookieSpecs.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/CookieSpecs.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/RequestConfig.Builder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/RequestConfig.Builder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/RequestConfig.Builder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/RequestConfig.Builder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/RequestConfig.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/RequestConfig.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/RequestConfig.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/RequestConfig.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DecompressingEntity.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DecompressingEntity.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DecompressingEntity.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DecompressingEntity.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateDecompressingEntity.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateDecompressingEntity.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateDecompressingEntity.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateDecompressingEntity.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateInputStream.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateInputStream.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateInputStream.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateInputStream.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateInputStreamFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateInputStreamFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateInputStreamFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateInputStreamFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/EntityBuilder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/EntityBuilder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/EntityBuilder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/EntityBuilder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GZIPInputStreamFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GZIPInputStreamFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GZIPInputStreamFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GZIPInputStreamFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GzipCompressingEntity.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GzipCompressingEntity.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GzipCompressingEntity.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GzipCompressingEntity.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GzipDecompressingEntity.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GzipDecompressingEntity.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GzipDecompressingEntity.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GzipDecompressingEntity.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/InputStreamFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/InputStreamFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/InputStreamFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/InputStreamFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/UrlEncodedFormEntity.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/UrlEncodedFormEntity.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/UrlEncodedFormEntity.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/UrlEncodedFormEntity.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DecompressingEntity.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DecompressingEntity.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DecompressingEntity.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DecompressingEntity.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateDecompressingEntity.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateDecompressingEntity.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateDecompressingEntity.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateDecompressingEntity.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateInputStream.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateInputStream.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateInputStream.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateInputStream.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateInputStreamFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateInputStreamFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateInputStreamFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateInputStreamFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/EntityBuilder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/EntityBuilder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/EntityBuilder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/EntityBuilder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GZIPInputStreamFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GZIPInputStreamFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GZIPInputStreamFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GZIPInputStreamFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GzipCompressingEntity.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GzipCompressingEntity.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GzipCompressingEntity.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GzipCompressingEntity.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GzipDecompressingEntity.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GzipDecompressingEntity.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GzipDecompressingEntity.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GzipDecompressingEntity.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/InputStreamFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/InputStreamFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/InputStreamFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/InputStreamFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/UrlEncodedFormEntity.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/UrlEncodedFormEntity.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/UrlEncodedFormEntity.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/UrlEncodedFormEntity.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Async.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Async.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Async.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Async.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Content.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Content.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Content.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Content.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/ContentResponseHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/ContentResponseHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/ContentResponseHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/ContentResponseHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Executor.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Executor.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Executor.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Executor.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Form.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Form.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Form.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Form.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Request.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Request.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Request.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Request.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Response.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Response.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Response.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Response.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Async.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Async.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Async.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Async.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Content.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Content.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Content.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Content.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/ContentResponseHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/ContentResponseHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/ContentResponseHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/ContentResponseHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Executor.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Executor.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Executor.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Executor.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Form.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Form.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Form.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Form.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Request.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Request.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Request.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Request.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Response.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Response.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Response.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Response.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/AbortableHttpRequest.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/AbortableHttpRequest.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/AbortableHttpRequest.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/AbortableHttpRequest.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/AbstractExecutionAwareRequest.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/AbstractExecutionAwareRequest.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/AbstractExecutionAwareRequest.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/AbstractExecutionAwareRequest.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/CloseableHttpResponse.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/CloseableHttpResponse.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/CloseableHttpResponse.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/CloseableHttpResponse.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/Configurable.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/Configurable.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/Configurable.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/Configurable.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpDelete.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpDelete.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpDelete.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpDelete.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpExecutionAware.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpExecutionAware.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpExecutionAware.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpExecutionAware.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpGet.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpGet.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpGet.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpGet.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpHead.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpHead.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpHead.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpHead.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpOptions.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpOptions.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpOptions.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpOptions.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPatch.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPatch.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPatch.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPatch.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPost.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPost.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPost.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPost.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPut.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPut.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPut.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPut.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpRequestBase.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpRequestBase.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpRequestBase.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpRequestBase.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpRequestWrapper.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpRequestWrapper.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpRequestWrapper.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpRequestWrapper.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpTrace.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpTrace.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpTrace.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpTrace.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpUriRequest.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpUriRequest.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpUriRequest.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpUriRequest.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/RequestBuilder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/RequestBuilder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/RequestBuilder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/RequestBuilder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/AbortableHttpRequest.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/AbortableHttpRequest.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/AbortableHttpRequest.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/AbortableHttpRequest.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/AbstractExecutionAwareRequest.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/AbstractExecutionAwareRequest.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/AbstractExecutionAwareRequest.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/AbstractExecutionAwareRequest.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/CloseableHttpResponse.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/CloseableHttpResponse.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/CloseableHttpResponse.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/CloseableHttpResponse.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/Configurable.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/Configurable.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/Configurable.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/Configurable.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpDelete.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpDelete.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpDelete.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpDelete.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpEntityEnclosingRequestBase.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpEntityEnclosingRequestBase.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpEntityEnclosingRequestBase.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpEntityEnclosingRequestBase.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpExecutionAware.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpExecutionAware.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpExecutionAware.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpExecutionAware.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpGet.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpGet.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpGet.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpGet.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpHead.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpHead.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpHead.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpHead.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpOptions.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpOptions.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpOptions.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpOptions.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPatch.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPatch.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPatch.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPatch.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPost.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPost.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPost.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPost.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPut.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPut.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPut.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPut.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpRequestBase.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpRequestBase.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpRequestBase.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpRequestBase.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpRequestWrapper.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpRequestWrapper.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpRequestWrapper.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpRequestWrapper.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpTrace.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpTrace.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpTrace.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpTrace.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpUriRequest.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpUriRequest.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpUriRequest.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpUriRequest.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/RequestBuilder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/RequestBuilder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/RequestBuilder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/RequestBuilder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/AllClientPNames.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/AllClientPNames.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/AllClientPNames.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/AllClientPNames.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/AuthPolicy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/AuthPolicy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/AuthPolicy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/AuthPolicy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/ClientPNames.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/ClientPNames.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/ClientPNames.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/ClientPNames.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/ClientParamBean.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/ClientParamBean.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/ClientParamBean.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/ClientParamBean.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/CookiePolicy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/CookiePolicy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/CookiePolicy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/CookiePolicy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/HttpClientParamConfig.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/HttpClientParamConfig.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/HttpClientParamConfig.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/HttpClientParamConfig.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/HttpClientParams.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/HttpClientParams.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/HttpClientParams.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/HttpClientParams.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/AllClientPNames.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/AllClientPNames.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/AllClientPNames.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/AllClientPNames.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/AuthPolicy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/AuthPolicy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/AuthPolicy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/AuthPolicy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/ClientPNames.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/ClientPNames.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/ClientPNames.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/ClientPNames.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/ClientParamBean.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/ClientParamBean.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/ClientParamBean.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/ClientParamBean.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/CookiePolicy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/CookiePolicy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/CookiePolicy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/CookiePolicy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/HttpClientParamConfig.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/HttpClientParamConfig.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/HttpClientParamConfig.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/HttpClientParamConfig.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/HttpClientParams.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/HttpClientParams.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/HttpClientParams.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/HttpClientParams.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ClientContext.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ClientContext.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ClientContext.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ClientContext.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ClientContextConfigurer.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ClientContextConfigurer.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ClientContextConfigurer.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ClientContextConfigurer.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/HttpClientContext.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/HttpClientContext.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/HttpClientContext.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/HttpClientContext.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAcceptEncoding.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAcceptEncoding.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAcceptEncoding.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAcceptEncoding.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAddCookies.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAddCookies.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAddCookies.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAddCookies.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAuthCache.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAuthCache.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAuthCache.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAuthCache.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestClientConnControl.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestClientConnControl.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestClientConnControl.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestClientConnControl.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestDefaultHeaders.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestDefaultHeaders.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestDefaultHeaders.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestDefaultHeaders.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestExpectContinue.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestExpectContinue.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestExpectContinue.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestExpectContinue.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestProxyAuthentication.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestProxyAuthentication.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestProxyAuthentication.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestProxyAuthentication.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestTargetAuthentication.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestTargetAuthentication.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestTargetAuthentication.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestTargetAuthentication.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseAuthCache.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseAuthCache.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseAuthCache.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseAuthCache.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseContentEncoding.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseContentEncoding.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseContentEncoding.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseContentEncoding.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseProcessCookies.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseProcessCookies.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseProcessCookies.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseProcessCookies.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ClientContext.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ClientContext.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ClientContext.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ClientContext.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ClientContextConfigurer.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ClientContextConfigurer.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ClientContextConfigurer.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ClientContextConfigurer.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/HttpClientContext.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/HttpClientContext.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/HttpClientContext.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/HttpClientContext.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAcceptEncoding.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAcceptEncoding.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAcceptEncoding.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAcceptEncoding.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAddCookies.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAddCookies.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAddCookies.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAddCookies.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAuthCache.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAuthCache.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAuthCache.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAuthCache.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestClientConnControl.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestClientConnControl.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestClientConnControl.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestClientConnControl.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestDefaultHeaders.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestDefaultHeaders.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestDefaultHeaders.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestDefaultHeaders.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestExpectContinue.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestExpectContinue.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestExpectContinue.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestExpectContinue.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestProxyAuthentication.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestProxyAuthentication.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestProxyAuthentication.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestProxyAuthentication.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestTargetAuthentication.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestTargetAuthentication.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestTargetAuthentication.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestTargetAuthentication.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseAuthCache.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseAuthCache.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseAuthCache.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseAuthCache.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseContentEncoding.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseContentEncoding.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseContentEncoding.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseContentEncoding.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseProcessCookies.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseProcessCookies.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseProcessCookies.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseProcessCookies.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/CloneUtils.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/CloneUtils.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/CloneUtils.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/CloneUtils.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/DateUtils.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/DateUtils.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/DateUtils.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/DateUtils.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/HttpClientUtils.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/HttpClientUtils.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/HttpClientUtils.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/HttpClientUtils.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Idn.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Idn.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Idn.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Idn.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/JdkIdn.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/JdkIdn.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/JdkIdn.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/JdkIdn.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Punycode.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Punycode.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Punycode.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Punycode.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Rfc3492Idn.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Rfc3492Idn.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Rfc3492Idn.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Rfc3492Idn.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIBuilder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIBuilder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIBuilder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIBuilder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIUtils.UriFlag.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIUtils.UriFlag.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIUtils.UriFlag.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIUtils.UriFlag.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIUtils.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIUtils.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIUtils.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIUtils.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URLEncodedUtils.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URLEncodedUtils.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URLEncodedUtils.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URLEncodedUtils.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/CloneUtils.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/CloneUtils.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/CloneUtils.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/CloneUtils.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/DateUtils.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/DateUtils.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/DateUtils.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/DateUtils.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/HttpClientUtils.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/HttpClientUtils.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/HttpClientUtils.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/HttpClientUtils.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Idn.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Idn.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Idn.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Idn.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/JdkIdn.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/JdkIdn.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/JdkIdn.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/JdkIdn.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Punycode.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Punycode.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Punycode.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Punycode.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Rfc3492Idn.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Rfc3492Idn.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Rfc3492Idn.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Rfc3492Idn.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIBuilder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIBuilder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIBuilder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIBuilder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIUtils.UriFlag.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIUtils.UriFlag.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIUtils.UriFlag.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIUtils.UriFlag.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIUtils.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIUtils.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIUtils.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIUtils.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URLEncodedUtils.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URLEncodedUtils.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URLEncodedUtils.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URLEncodedUtils.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/BasicEofSensorWatcher.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/BasicEofSensorWatcher.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/BasicEofSensorWatcher.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/BasicEofSensorWatcher.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/BasicManagedEntity.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/BasicManagedEntity.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/BasicManagedEntity.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/BasicManagedEntity.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionManagerFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionManagerFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionManagerFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionManagerFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionOperator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionOperator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionOperator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionOperator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionRequest.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionRequest.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionRequest.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionRequest.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectTimeoutException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectTimeoutException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectTimeoutException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectTimeoutException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionKeepAliveStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionKeepAliveStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionKeepAliveStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionKeepAliveStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionPoolTimeoutException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionPoolTimeoutException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionPoolTimeoutException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionPoolTimeoutException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionReleaseTrigger.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionReleaseTrigger.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionReleaseTrigger.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionReleaseTrigger.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionRequest.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionRequest.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionRequest.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionRequest.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/DnsResolver.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/DnsResolver.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/DnsResolver.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/DnsResolver.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/EofSensorInputStream.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/EofSensorInputStream.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/EofSensorInputStream.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/EofSensorInputStream.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/EofSensorWatcher.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/EofSensorWatcher.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/EofSensorWatcher.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/EofSensorWatcher.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpClientConnectionManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpClientConnectionManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpClientConnectionManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpClientConnectionManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpClientConnectionOperator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpClientConnectionOperator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpClientConnectionOperator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpClientConnectionOperator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpConnectionFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpConnectionFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpConnectionFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpConnectionFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpHostConnectException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpHostConnectException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpHostConnectException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpHostConnectException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpInetSocketAddress.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpInetSocketAddress.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpInetSocketAddress.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpInetSocketAddress.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpRoutedConnection.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpRoutedConnection.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpRoutedConnection.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpRoutedConnection.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ManagedClientConnection.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ManagedClientConnection.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ManagedClientConnection.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ManagedClientConnection.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ManagedHttpClientConnection.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ManagedHttpClientConnection.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ManagedHttpClientConnection.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ManagedHttpClientConnection.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/MultihomePlainSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/MultihomePlainSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/MultihomePlainSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/MultihomePlainSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/OperatedClientConnection.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/OperatedClientConnection.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/OperatedClientConnection.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/OperatedClientConnection.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/SchemePortResolver.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/SchemePortResolver.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/SchemePortResolver.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/SchemePortResolver.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/UnsupportedSchemeException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/UnsupportedSchemeException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/UnsupportedSchemeException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/UnsupportedSchemeException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/BasicEofSensorWatcher.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/BasicEofSensorWatcher.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/BasicEofSensorWatcher.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/BasicEofSensorWatcher.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/BasicManagedEntity.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/BasicManagedEntity.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/BasicManagedEntity.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/BasicManagedEntity.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionManagerFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionManagerFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionManagerFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionManagerFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionOperator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionOperator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionOperator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionOperator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionRequest.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionRequest.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionRequest.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionRequest.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectTimeoutException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectTimeoutException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectTimeoutException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectTimeoutException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionKeepAliveStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionKeepAliveStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionKeepAliveStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionKeepAliveStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionPoolTimeoutException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionPoolTimeoutException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionPoolTimeoutException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionPoolTimeoutException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionReleaseTrigger.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionReleaseTrigger.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionReleaseTrigger.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionReleaseTrigger.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionRequest.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionRequest.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionRequest.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionRequest.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/DnsResolver.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/DnsResolver.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/DnsResolver.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/DnsResolver.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/EofSensorInputStream.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/EofSensorInputStream.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/EofSensorInputStream.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/EofSensorInputStream.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/EofSensorWatcher.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/EofSensorWatcher.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/EofSensorWatcher.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/EofSensorWatcher.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpClientConnectionManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpClientConnectionManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpClientConnectionManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpClientConnectionManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpClientConnectionOperator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpClientConnectionOperator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpClientConnectionOperator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpClientConnectionOperator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpConnectionFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpConnectionFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpConnectionFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpConnectionFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpHostConnectException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpHostConnectException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpHostConnectException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpHostConnectException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpInetSocketAddress.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpInetSocketAddress.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpInetSocketAddress.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpInetSocketAddress.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpRoutedConnection.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpRoutedConnection.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpRoutedConnection.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpRoutedConnection.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ManagedClientConnection.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ManagedClientConnection.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ManagedClientConnection.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ManagedClientConnection.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ManagedHttpClientConnection.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ManagedHttpClientConnection.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ManagedHttpClientConnection.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ManagedHttpClientConnection.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/MultihomePlainSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/MultihomePlainSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/MultihomePlainSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/MultihomePlainSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/OperatedClientConnection.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/OperatedClientConnection.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/OperatedClientConnection.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/OperatedClientConnection.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/SchemePortResolver.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/SchemePortResolver.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/SchemePortResolver.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/SchemePortResolver.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/UnsupportedSchemeException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/UnsupportedSchemeException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/UnsupportedSchemeException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/UnsupportedSchemeException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnConnectionPNames.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnConnectionPNames.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnConnectionPNames.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnConnectionPNames.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnConnectionParamBean.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnConnectionParamBean.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnConnectionParamBean.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnConnectionParamBean.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerPNames.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerPNames.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerPNames.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerPNames.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerParamBean.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerParamBean.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerParamBean.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerParamBean.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerParams.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerParams.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerParams.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerParams.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnPerRoute.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnPerRoute.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnPerRoute.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnPerRoute.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnPerRouteBean.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnPerRouteBean.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnPerRouteBean.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnPerRouteBean.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRoutePNames.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRoutePNames.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRoutePNames.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRoutePNames.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRouteParamBean.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRouteParamBean.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRouteParamBean.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRouteParamBean.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRouteParams.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRouteParams.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRouteParams.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRouteParams.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnConnectionPNames.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnConnectionPNames.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnConnectionPNames.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnConnectionPNames.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnConnectionParamBean.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnConnectionParamBean.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnConnectionParamBean.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnConnectionParamBean.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerPNames.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerPNames.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerPNames.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerPNames.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerParamBean.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerParamBean.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerParamBean.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerParamBean.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerParams.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerParams.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerParams.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerParams.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnPerRoute.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnPerRoute.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnPerRoute.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnPerRoute.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnPerRouteBean.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnPerRouteBean.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnPerRouteBean.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnPerRouteBean.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRoutePNames.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRoutePNames.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRoutePNames.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRoutePNames.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRouteParamBean.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRouteParamBean.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRouteParamBean.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRouteParamBean.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRouteParams.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRouteParams.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRouteParams.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRouteParams.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/BasicRouteDirector.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/BasicRouteDirector.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/BasicRouteDirector.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/BasicRouteDirector.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRoute.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRoute.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRoute.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRoute.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRouteDirector.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRouteDirector.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRouteDirector.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRouteDirector.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRoutePlanner.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRoutePlanner.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRoutePlanner.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRoutePlanner.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.LayerType.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.LayerType.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.LayerType.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.LayerType.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.TunnelType.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.TunnelType.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.TunnelType.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.TunnelType.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteTracker.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteTracker.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteTracker.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteTracker.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/BasicRouteDirector.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/BasicRouteDirector.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/BasicRouteDirector.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/BasicRouteDirector.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRoute.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRoute.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRoute.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRoute.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRouteDirector.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRouteDirector.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRouteDirector.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRouteDirector.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRoutePlanner.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRoutePlanner.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRoutePlanner.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRoutePlanner.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.LayerType.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.LayerType.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.LayerType.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.LayerType.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.TunnelType.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.TunnelType.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.TunnelType.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.TunnelType.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteTracker.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteTracker.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteTracker.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteTracker.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/HostNameResolver.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/HostNameResolver.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/HostNameResolver.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/HostNameResolver.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/LayeredSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/LayeredSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/LayeredSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/LayeredSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/PlainSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/PlainSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/PlainSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/PlainSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/Scheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/Scheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/Scheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/Scheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeLayeredSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeLayeredSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeLayeredSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeLayeredSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeRegistry.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeRegistry.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeRegistry.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeRegistry.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/HostNameResolver.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/HostNameResolver.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/HostNameResolver.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/HostNameResolver.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/LayeredSchemeSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/LayeredSchemeSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/LayeredSchemeSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/LayeredSchemeSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/LayeredSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/LayeredSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/LayeredSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/LayeredSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/PlainSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/PlainSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/PlainSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/PlainSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/Scheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/Scheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/Scheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/Scheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeLayeredSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeLayeredSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeLayeredSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeLayeredSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeRegistry.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeRegistry.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeRegistry.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeRegistry.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/ConnectionSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/ConnectionSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/ConnectionSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/ConnectionSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/LayeredConnectionSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/LayeredConnectionSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/LayeredConnectionSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/LayeredConnectionSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/PlainConnectionSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/PlainConnectionSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/PlainConnectionSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/PlainConnectionSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/ConnectionSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/ConnectionSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/ConnectionSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/ConnectionSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/LayeredConnectionSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/LayeredConnectionSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/LayeredConnectionSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/LayeredConnectionSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/PlainConnectionSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/PlainConnectionSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/PlainConnectionSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/PlainConnectionSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/AbstractVerifier.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/AbstractVerifier.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/AbstractVerifier.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/AbstractVerifier.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/AllowAllHostnameVerifier.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/AllowAllHostnameVerifier.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/AllowAllHostnameVerifier.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/AllowAllHostnameVerifier.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/DefaultHostnameVerifier.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/DefaultHostnameVerifier.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/DefaultHostnameVerifier.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/DefaultHostnameVerifier.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/NoopHostnameVerifier.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/NoopHostnameVerifier.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/NoopHostnameVerifier.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/NoopHostnameVerifier.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/PrivateKeyDetails.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/PrivateKeyDetails.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/PrivateKeyDetails.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/PrivateKeyDetails.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/PrivateKeyStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/PrivateKeyStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/PrivateKeyStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/PrivateKeyStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLConnectionSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLConnectionSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLConnectionSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLConnectionSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLContextBuilder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLContextBuilder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLContextBuilder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLContextBuilder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLContexts.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLContexts.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLContexts.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLContexts.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLInitializationException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLInitializationException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLInitializationException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLInitializationException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/StrictHostnameVerifier.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/StrictHostnameVerifier.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/StrictHostnameVerifier.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/StrictHostnameVerifier.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustAllStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustAllStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustAllStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustAllStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustSelfSignedStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustSelfSignedStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustSelfSignedStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustSelfSignedStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/X509HostnameVerifier.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/X509HostnameVerifier.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/X509HostnameVerifier.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/X509HostnameVerifier.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/AbstractVerifier.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/AbstractVerifier.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/AbstractVerifier.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/AbstractVerifier.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/AllowAllHostnameVerifier.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/AllowAllHostnameVerifier.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/AllowAllHostnameVerifier.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/AllowAllHostnameVerifier.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/BrowserCompatHostnameVerifier.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/BrowserCompatHostnameVerifier.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/BrowserCompatHostnameVerifier.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/BrowserCompatHostnameVerifier.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/DefaultHostnameVerifier.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/DefaultHostnameVerifier.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/DefaultHostnameVerifier.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/DefaultHostnameVerifier.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/NoopHostnameVerifier.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/NoopHostnameVerifier.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/NoopHostnameVerifier.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/NoopHostnameVerifier.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/PrivateKeyDetails.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/PrivateKeyDetails.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/PrivateKeyDetails.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/PrivateKeyDetails.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/PrivateKeyStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/PrivateKeyStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/PrivateKeyStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/PrivateKeyStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLConnectionSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLConnectionSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLConnectionSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLConnectionSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLContextBuilder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLContextBuilder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLContextBuilder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLContextBuilder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLContexts.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLContexts.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLContexts.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLContexts.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLInitializationException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLInitializationException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLInitializationException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLInitializationException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLSocketFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLSocketFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLSocketFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLSocketFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/StrictHostnameVerifier.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/StrictHostnameVerifier.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/StrictHostnameVerifier.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/StrictHostnameVerifier.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustAllStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustAllStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustAllStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustAllStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustSelfSignedStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustSelfSignedStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustSelfSignedStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustSelfSignedStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/X509HostnameVerifier.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/X509HostnameVerifier.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/X509HostnameVerifier.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/X509HostnameVerifier.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/DnsUtils.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/DnsUtils.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/DnsUtils.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/DnsUtils.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/DomainType.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/DomainType.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/DomainType.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/DomainType.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/InetAddressUtils.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/InetAddressUtils.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/InetAddressUtils.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/InetAddressUtils.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixList.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixList.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixList.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixList.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixListParser.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixListParser.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixListParser.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixListParser.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixMatcher.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixMatcher.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixMatcher.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixMatcher.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixMatcherLoader.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixMatcherLoader.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixMatcherLoader.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixMatcherLoader.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/DnsUtils.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/DnsUtils.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/DnsUtils.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/DnsUtils.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/DomainType.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/DomainType.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/DomainType.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/DomainType.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/InetAddressUtils.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/InetAddressUtils.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/InetAddressUtils.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/InetAddressUtils.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixList.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixList.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixList.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixList.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixListParser.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixListParser.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixListParser.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixListParser.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixMatcher.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixMatcher.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixMatcher.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixMatcher.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixMatcherLoader.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixMatcherLoader.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixMatcherLoader.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixMatcherLoader.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/ClientCookie.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/ClientCookie.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/ClientCookie.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/ClientCookie.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CommonCookieAttributeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CommonCookieAttributeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CommonCookieAttributeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CommonCookieAttributeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/Cookie.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/Cookie.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/Cookie.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/Cookie.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieAttributeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieAttributeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieAttributeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieAttributeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieIdentityComparator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieIdentityComparator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieIdentityComparator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieIdentityComparator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieOrigin.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieOrigin.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieOrigin.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieOrigin.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookiePathComparator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookiePathComparator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookiePathComparator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookiePathComparator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookiePriorityComparator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookiePriorityComparator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookiePriorityComparator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookiePriorityComparator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieRestrictionViolationException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieRestrictionViolationException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieRestrictionViolationException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieRestrictionViolationException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecRegistry.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecRegistry.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecRegistry.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecRegistry.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/MalformedCookieException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/MalformedCookieException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/MalformedCookieException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/MalformedCookieException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SM.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SM.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SM.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SM.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SetCookie.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SetCookie.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SetCookie.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SetCookie.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SetCookie2.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SetCookie2.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SetCookie2.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SetCookie2.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/ClientCookie.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/ClientCookie.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/ClientCookie.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/ClientCookie.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CommonCookieAttributeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CommonCookieAttributeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CommonCookieAttributeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CommonCookieAttributeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/Cookie.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/Cookie.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/Cookie.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/Cookie.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieAttributeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieAttributeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieAttributeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieAttributeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieIdentityComparator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieIdentityComparator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieIdentityComparator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieIdentityComparator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieOrigin.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieOrigin.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieOrigin.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieOrigin.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookiePathComparator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookiePathComparator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookiePathComparator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookiePathComparator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookiePriorityComparator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookiePriorityComparator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookiePriorityComparator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookiePriorityComparator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieRestrictionViolationException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieRestrictionViolationException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieRestrictionViolationException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieRestrictionViolationException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecRegistry.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecRegistry.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecRegistry.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecRegistry.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/MalformedCookieException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/MalformedCookieException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/MalformedCookieException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/MalformedCookieException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SM.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SM.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SM.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SM.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SetCookie.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SetCookie.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SetCookie.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SetCookie.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SetCookie2.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SetCookie2.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SetCookie2.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SetCookie2.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/CookieSpecPNames.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/CookieSpecPNames.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/CookieSpecPNames.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/CookieSpecPNames.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/CookieSpecParamBean.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/CookieSpecParamBean.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/CookieSpecParamBean.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/CookieSpecParamBean.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/class-use/CookieSpecPNames.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/class-use/CookieSpecPNames.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/class-use/CookieSpecPNames.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/class-use/CookieSpecPNames.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/class-use/CookieSpecParamBean.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/class-use/CookieSpecParamBean.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/class-use/CookieSpecParamBean.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/class-use/CookieSpecParamBean.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/FormBodyPart.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/FormBodyPart.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/FormBodyPart.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/FormBodyPart.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/FormBodyPartBuilder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/FormBodyPartBuilder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/FormBodyPartBuilder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/FormBodyPartBuilder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/Header.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/Header.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/Header.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/Header.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/HttpMultipart.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/HttpMultipart.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/HttpMultipart.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/HttpMultipart.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/HttpMultipartMode.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/HttpMultipartMode.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/HttpMultipartMode.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/HttpMultipartMode.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MIME.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MIME.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MIME.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MIME.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MinimalField.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MinimalField.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MinimalField.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MinimalField.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MultipartEntity.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MultipartEntity.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MultipartEntity.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MultipartEntity.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MultipartEntityBuilder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MultipartEntityBuilder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MultipartEntityBuilder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MultipartEntityBuilder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/FormBodyPart.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/FormBodyPart.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/FormBodyPart.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/FormBodyPart.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/FormBodyPartBuilder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/FormBodyPartBuilder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/FormBodyPartBuilder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/FormBodyPartBuilder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/Header.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/Header.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/Header.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/Header.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/HttpMultipart.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/HttpMultipart.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/HttpMultipart.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/HttpMultipart.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/HttpMultipartMode.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/HttpMultipartMode.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/HttpMultipartMode.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/HttpMultipartMode.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MIME.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MIME.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MIME.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MIME.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MinimalField.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MinimalField.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MinimalField.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MinimalField.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MultipartEntity.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MultipartEntity.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MultipartEntity.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MultipartEntity.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MultipartEntityBuilder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MultipartEntityBuilder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MultipartEntityBuilder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MultipartEntityBuilder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/AbstractContentBody.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/AbstractContentBody.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/AbstractContentBody.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/AbstractContentBody.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ByteArrayBody.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ByteArrayBody.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ByteArrayBody.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ByteArrayBody.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ContentBody.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ContentBody.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ContentBody.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ContentBody.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ContentDescriptor.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ContentDescriptor.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ContentDescriptor.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ContentDescriptor.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/FileBody.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/FileBody.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/FileBody.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/FileBody.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/InputStreamBody.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/InputStreamBody.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/InputStreamBody.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/InputStreamBody.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/StringBody.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/StringBody.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/StringBody.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/StringBody.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/AbstractContentBody.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/AbstractContentBody.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/AbstractContentBody.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/AbstractContentBody.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ByteArrayBody.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ByteArrayBody.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ByteArrayBody.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ByteArrayBody.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ContentBody.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ContentBody.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ContentBody.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ContentBody.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ContentDescriptor.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ContentDescriptor.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ContentDescriptor.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ContentDescriptor.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/FileBody.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/FileBody.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/FileBody.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/FileBody.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/InputStreamBody.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/InputStreamBody.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/InputStreamBody.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/InputStreamBody.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/StringBody.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/StringBody.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/StringBody.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/StringBody.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/AuthSchemeBase.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/AuthSchemeBase.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/AuthSchemeBase.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/AuthSchemeBase.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/BasicScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/BasicScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/BasicScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/BasicScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/BasicSchemeFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/BasicSchemeFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/BasicSchemeFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/BasicSchemeFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/DigestScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/DigestScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/DigestScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/DigestScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/DigestSchemeFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/DigestSchemeFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/DigestSchemeFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/DigestSchemeFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/GGSSchemeBase.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/GGSSchemeBase.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/GGSSchemeBase.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/GGSSchemeBase.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/HttpAuthenticator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/HttpAuthenticator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/HttpAuthenticator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/HttpAuthenticator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/KerberosScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/KerberosScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/KerberosScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/KerberosScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/KerberosSchemeFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/KerberosSchemeFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/KerberosSchemeFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/KerberosSchemeFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMEngine.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMEngine.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMEngine.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMEngine.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMEngineException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMEngineException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMEngineException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMEngineException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMSchemeFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMSchemeFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMSchemeFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMSchemeFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NegotiateScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NegotiateScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NegotiateScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NegotiateScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NegotiateSchemeFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NegotiateSchemeFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NegotiateSchemeFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NegotiateSchemeFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/RFC2617Scheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/RFC2617Scheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/RFC2617Scheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/RFC2617Scheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SPNegoScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SPNegoScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SPNegoScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SPNegoScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SPNegoSchemeFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SPNegoSchemeFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SPNegoSchemeFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SPNegoSchemeFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SpnegoTokenGenerator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SpnegoTokenGenerator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SpnegoTokenGenerator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SpnegoTokenGenerator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/AuthSchemeBase.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/AuthSchemeBase.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/AuthSchemeBase.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/AuthSchemeBase.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/BasicScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/BasicScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/BasicScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/BasicScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/BasicSchemeFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/BasicSchemeFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/BasicSchemeFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/BasicSchemeFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/DigestScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/DigestScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/DigestScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/DigestScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/DigestSchemeFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/DigestSchemeFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/DigestSchemeFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/DigestSchemeFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/GGSSchemeBase.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/GGSSchemeBase.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/GGSSchemeBase.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/GGSSchemeBase.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/HttpAuthenticator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/HttpAuthenticator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/HttpAuthenticator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/HttpAuthenticator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/KerberosScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/KerberosScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/KerberosScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/KerberosScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/KerberosSchemeFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/KerberosSchemeFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/KerberosSchemeFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/KerberosSchemeFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMEngine.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMEngine.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMEngine.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMEngine.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMEngineException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMEngineException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMEngineException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMEngineException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMSchemeFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMSchemeFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMSchemeFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMSchemeFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NegotiateScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NegotiateScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NegotiateScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NegotiateScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NegotiateSchemeFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NegotiateSchemeFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NegotiateSchemeFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NegotiateSchemeFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/RFC2617Scheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/RFC2617Scheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/RFC2617Scheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/RFC2617Scheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SPNegoScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SPNegoScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SPNegoScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SPNegoScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SPNegoSchemeFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SPNegoSchemeFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SPNegoSchemeFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SPNegoSchemeFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SpnegoTokenGenerator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SpnegoTokenGenerator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SpnegoTokenGenerator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SpnegoTokenGenerator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/UnsupportedDigestAlgorithmException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/UnsupportedDigestAlgorithmException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/UnsupportedDigestAlgorithmException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/UnsupportedDigestAlgorithmException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/CurrentWindowsCredentials.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/CurrentWindowsCredentials.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/CurrentWindowsCredentials.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/CurrentWindowsCredentials.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsCredentialsProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsCredentialsProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsCredentialsProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsCredentialsProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNTLMSchemeFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNTLMSchemeFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNTLMSchemeFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNTLMSchemeFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNegotiateScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNegotiateScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNegotiateScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNegotiateScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/CurrentWindowsCredentials.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/CurrentWindowsCredentials.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/CurrentWindowsCredentials.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/CurrentWindowsCredentials.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsCredentialsProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsCredentialsProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsCredentialsProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsCredentialsProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNTLMSchemeFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNTLMSchemeFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNTLMSchemeFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNTLMSchemeFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNegotiateScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNegotiateScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNegotiateScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNegotiateScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNegotiateSchemeFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNegotiateSchemeFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNegotiateSchemeFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNegotiateSchemeFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AIMDBackoffManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AIMDBackoffManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AIMDBackoffManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AIMDBackoffManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractAuthenticationHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractAuthenticationHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractAuthenticationHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractAuthenticationHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractHttpClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractHttpClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractHttpClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractHttpClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractResponseHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractResponseHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractResponseHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractResponseHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AutoRetryHttpClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AutoRetryHttpClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AutoRetryHttpClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AutoRetryHttpClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicAuthCache.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicAuthCache.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicAuthCache.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicAuthCache.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicCookieStore.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicCookieStore.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicCookieStore.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicCookieStore.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicCredentialsProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicCredentialsProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicCredentialsProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicCredentialsProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicResponseHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicResponseHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicResponseHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicResponseHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ClientParamsStack.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ClientParamsStack.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ClientParamsStack.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ClientParamsStack.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/CloseableHttpClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/CloseableHttpClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/CloseableHttpClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/CloseableHttpClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ContentEncodingHttpClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ContentEncodingHttpClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ContentEncodingHttpClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ContentEncodingHttpClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/CookieSpecRegistries.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/CookieSpecRegistries.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/CookieSpecRegistries.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/CookieSpecRegistries.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DecompressingHttpClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DecompressingHttpClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DecompressingHttpClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DecompressingHttpClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultBackoffStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultBackoffStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultBackoffStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultBackoffStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultClientConnectionReuseStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultClientConnectionReuseStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultClientConnectionReuseStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultClientConnectionReuseStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultHttpClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultHttpClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultHttpClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultHttpClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRedirectHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRedirectHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRedirectHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRedirectHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRedirectStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRedirectStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRedirectStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRedirectStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRequestDirector.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRequestDirector.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRequestDirector.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRequestDirector.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultUserTokenHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultUserTokenHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultUserTokenHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultUserTokenHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/EntityEnclosingRequestWrapper.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/EntityEnclosingRequestWrapper.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/EntityEnclosingRequestWrapper.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/EntityEnclosingRequestWrapper.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/FutureRequestExecutionMetrics.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/FutureRequestExecutionMetrics.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/FutureRequestExecutionMetrics.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/FutureRequestExecutionMetrics.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/FutureRequestExecutionService.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/FutureRequestExecutionService.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/FutureRequestExecutionService.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/FutureRequestExecutionService.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpAuthenticator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpAuthenticator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpAuthenticator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpAuthenticator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpClientBuilder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpClientBuilder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpClientBuilder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpClientBuilder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpClients.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpClients.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpClients.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpClients.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpRequestFutureTask.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpRequestFutureTask.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpRequestFutureTask.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpRequestFutureTask.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/IdleConnectionEvictor.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/IdleConnectionEvictor.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/IdleConnectionEvictor.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/IdleConnectionEvictor.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/LaxRedirectStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/LaxRedirectStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/LaxRedirectStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/LaxRedirectStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/NoopUserTokenHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/NoopUserTokenHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/NoopUserTokenHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/NoopUserTokenHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/NullBackoffStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/NullBackoffStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/NullBackoffStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/NullBackoffStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ProxyAuthenticationStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ProxyAuthenticationStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ProxyAuthenticationStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ProxyAuthenticationStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ProxyClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ProxyClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ProxyClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ProxyClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RedirectLocations.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RedirectLocations.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RedirectLocations.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RedirectLocations.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RequestWrapper.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RequestWrapper.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RequestWrapper.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RequestWrapper.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RoutedRequest.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RoutedRequest.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RoutedRequest.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RoutedRequest.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/StandardHttpRequestRetryHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/StandardHttpRequestRetryHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/StandardHttpRequestRetryHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/StandardHttpRequestRetryHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/SystemDefaultCredentialsProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/SystemDefaultCredentialsProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/SystemDefaultCredentialsProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/SystemDefaultCredentialsProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/SystemDefaultHttpClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/SystemDefaultHttpClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/SystemDefaultHttpClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/SystemDefaultHttpClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/TargetAuthenticationStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/TargetAuthenticationStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/TargetAuthenticationStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/TargetAuthenticationStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/TunnelRefusedException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/TunnelRefusedException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/TunnelRefusedException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/TunnelRefusedException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/WinHttpClients.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/WinHttpClients.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/WinHttpClients.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/WinHttpClients.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/AsynchronousValidationRequest.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/AsynchronousValidationRequest.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/AsynchronousValidationRequest.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/AsynchronousValidationRequest.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/BasicHttpCacheStorage.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/BasicHttpCacheStorage.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/BasicHttpCacheStorage.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/BasicHttpCacheStorage.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CacheConfig.Builder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CacheConfig.Builder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CacheConfig.Builder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CacheConfig.Builder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CacheConfig.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CacheConfig.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CacheConfig.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CacheConfig.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingExec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingExec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingExec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingExec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClientBuilder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClientBuilder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClientBuilder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClientBuilder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClients.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClients.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClients.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClients.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/DefaultFailureCache.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/DefaultFailureCache.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/DefaultFailureCache.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/DefaultFailureCache.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/DefaultHttpCacheEntrySerializer.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/DefaultHttpCacheEntrySerializer.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/DefaultHttpCacheEntrySerializer.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/DefaultHttpCacheEntrySerializer.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FailureCache.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FailureCache.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FailureCache.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FailureCache.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FailureCacheValue.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FailureCacheValue.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FailureCacheValue.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FailureCacheValue.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FileResource.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FileResource.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FileResource.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FileResource.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FileResourceFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FileResourceFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FileResourceFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FileResourceFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/HeapResource.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/HeapResource.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/HeapResource.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/HeapResource.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/HeapResourceFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/HeapResourceFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/HeapResourceFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/HeapResourceFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ImmediateSchedulingStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ImmediateSchedulingStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ImmediateSchedulingStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ImmediateSchedulingStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ManagedHttpCacheStorage.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ManagedHttpCacheStorage.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ManagedHttpCacheStorage.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ManagedHttpCacheStorage.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/SchedulingStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/SchedulingStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/SchedulingStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/SchedulingStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/AsynchronousValidationRequest.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/AsynchronousValidationRequest.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/AsynchronousValidationRequest.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/AsynchronousValidationRequest.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/BasicHttpCacheStorage.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/BasicHttpCacheStorage.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/BasicHttpCacheStorage.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/BasicHttpCacheStorage.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CacheConfig.Builder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CacheConfig.Builder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CacheConfig.Builder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CacheConfig.Builder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CacheConfig.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CacheConfig.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CacheConfig.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CacheConfig.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingExec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingExec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingExec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingExec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClientBuilder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClientBuilder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClientBuilder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClientBuilder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClients.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClients.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClients.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClients.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/DefaultFailureCache.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/DefaultFailureCache.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/DefaultFailureCache.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/DefaultFailureCache.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/DefaultHttpCacheEntrySerializer.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/DefaultHttpCacheEntrySerializer.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/DefaultHttpCacheEntrySerializer.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/DefaultHttpCacheEntrySerializer.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ExponentialBackOffSchedulingStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ExponentialBackOffSchedulingStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ExponentialBackOffSchedulingStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ExponentialBackOffSchedulingStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FailureCache.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FailureCache.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FailureCache.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FailureCache.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FailureCacheValue.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FailureCacheValue.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FailureCacheValue.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FailureCacheValue.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FileResource.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FileResource.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FileResource.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FileResource.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FileResourceFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FileResourceFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FileResourceFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FileResourceFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/HeapResource.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/HeapResource.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/HeapResource.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/HeapResource.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/HeapResourceFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/HeapResourceFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/HeapResourceFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/HeapResourceFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ImmediateSchedulingStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ImmediateSchedulingStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ImmediateSchedulingStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ImmediateSchedulingStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ManagedHttpCacheStorage.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ManagedHttpCacheStorage.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ManagedHttpCacheStorage.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ManagedHttpCacheStorage.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/SchedulingStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/SchedulingStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/SchedulingStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/SchedulingStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/EhcacheHttpCacheStorage.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/EhcacheHttpCacheStorage.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/EhcacheHttpCacheStorage.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/EhcacheHttpCacheStorage.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/class-use/EhcacheHttpCacheStorage.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/class-use/EhcacheHttpCacheStorage.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/class-use/EhcacheHttpCacheStorage.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/class-use/EhcacheHttpCacheStorage.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/KeyHashingScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/KeyHashingScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/KeyHashingScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/KeyHashingScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntry.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntry.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntry.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntry.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedKeyHashingException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedKeyHashingException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedKeyHashingException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedKeyHashingException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedSerializationException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedSerializationException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedSerializationException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedSerializationException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/PrefixKeyHashingScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/PrefixKeyHashingScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/PrefixKeyHashingScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/PrefixKeyHashingScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/KeyHashingScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/KeyHashingScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/KeyHashingScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/KeyHashingScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntry.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntry.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntry.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntry.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryFactoryImpl.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryFactoryImpl.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryFactoryImpl.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryFactoryImpl.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryImpl.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryImpl.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryImpl.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryImpl.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedHttpCacheStorage.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedHttpCacheStorage.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedHttpCacheStorage.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedHttpCacheStorage.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedKeyHashingException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedKeyHashingException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedKeyHashingException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedKeyHashingException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedSerializationException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedSerializationException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedSerializationException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedSerializationException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/PrefixKeyHashingScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/PrefixKeyHashingScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/PrefixKeyHashingScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/PrefixKeyHashingScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/SHA256KeyHashingScheme.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/SHA256KeyHashingScheme.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/SHA256KeyHashingScheme.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/SHA256KeyHashingScheme.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AIMDBackoffManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AIMDBackoffManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AIMDBackoffManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AIMDBackoffManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractAuthenticationHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractAuthenticationHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractAuthenticationHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractAuthenticationHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractHttpClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractHttpClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractHttpClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractHttpClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractResponseHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractResponseHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractResponseHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractResponseHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AutoRetryHttpClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AutoRetryHttpClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AutoRetryHttpClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AutoRetryHttpClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicAuthCache.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicAuthCache.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicAuthCache.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicAuthCache.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicCookieStore.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicCookieStore.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicCookieStore.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicCookieStore.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicCredentialsProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicCredentialsProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicCredentialsProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicCredentialsProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicResponseHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicResponseHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicResponseHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicResponseHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ClientParamsStack.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ClientParamsStack.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ClientParamsStack.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ClientParamsStack.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/CloseableHttpClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/CloseableHttpClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/CloseableHttpClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/CloseableHttpClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ContentEncodingHttpClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ContentEncodingHttpClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ContentEncodingHttpClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ContentEncodingHttpClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/CookieSpecRegistries.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/CookieSpecRegistries.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/CookieSpecRegistries.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/CookieSpecRegistries.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DecompressingHttpClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DecompressingHttpClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DecompressingHttpClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DecompressingHttpClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultBackoffStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultBackoffStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultBackoffStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultBackoffStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultClientConnectionReuseStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultClientConnectionReuseStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultClientConnectionReuseStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultClientConnectionReuseStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultConnectionKeepAliveStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultConnectionKeepAliveStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultConnectionKeepAliveStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultConnectionKeepAliveStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultHttpClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultHttpClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultHttpClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultHttpClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultHttpRequestRetryHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultHttpRequestRetryHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultHttpRequestRetryHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultHttpRequestRetryHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultProxyAuthenticationHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultProxyAuthenticationHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultProxyAuthenticationHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultProxyAuthenticationHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRedirectHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRedirectHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRedirectHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRedirectHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRedirectStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRedirectStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRedirectStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRedirectStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRequestDirector.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRequestDirector.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRequestDirector.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRequestDirector.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultServiceUnavailableRetryStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultServiceUnavailableRetryStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultServiceUnavailableRetryStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultServiceUnavailableRetryStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultTargetAuthenticationHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultTargetAuthenticationHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultTargetAuthenticationHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultTargetAuthenticationHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultUserTokenHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultUserTokenHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultUserTokenHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultUserTokenHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/EntityEnclosingRequestWrapper.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/EntityEnclosingRequestWrapper.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/EntityEnclosingRequestWrapper.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/EntityEnclosingRequestWrapper.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/FutureRequestExecutionMetrics.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/FutureRequestExecutionMetrics.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/FutureRequestExecutionMetrics.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/FutureRequestExecutionMetrics.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/FutureRequestExecutionService.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/FutureRequestExecutionService.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/FutureRequestExecutionService.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/FutureRequestExecutionService.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpAuthenticator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpAuthenticator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpAuthenticator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpAuthenticator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpClientBuilder.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpClientBuilder.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpClientBuilder.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpClientBuilder.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpClients.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpClients.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpClients.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpClients.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpRequestFutureTask.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpRequestFutureTask.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpRequestFutureTask.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpRequestFutureTask.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/IdleConnectionEvictor.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/IdleConnectionEvictor.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/IdleConnectionEvictor.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/IdleConnectionEvictor.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/LaxRedirectStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/LaxRedirectStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/LaxRedirectStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/LaxRedirectStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/NoopUserTokenHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/NoopUserTokenHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/NoopUserTokenHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/NoopUserTokenHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/NullBackoffStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/NullBackoffStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/NullBackoffStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/NullBackoffStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ProxyAuthenticationStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ProxyAuthenticationStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ProxyAuthenticationStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ProxyAuthenticationStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ProxyClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ProxyClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ProxyClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ProxyClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RedirectLocations.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RedirectLocations.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RedirectLocations.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RedirectLocations.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RequestWrapper.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RequestWrapper.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RequestWrapper.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RequestWrapper.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RoutedRequest.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RoutedRequest.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RoutedRequest.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RoutedRequest.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/StandardHttpRequestRetryHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/StandardHttpRequestRetryHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/StandardHttpRequestRetryHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/StandardHttpRequestRetryHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/SystemDefaultCredentialsProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/SystemDefaultCredentialsProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/SystemDefaultCredentialsProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/SystemDefaultCredentialsProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/SystemDefaultHttpClient.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/SystemDefaultHttpClient.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/SystemDefaultHttpClient.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/SystemDefaultHttpClient.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/TargetAuthenticationStrategy.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/TargetAuthenticationStrategy.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/TargetAuthenticationStrategy.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/TargetAuthenticationStrategy.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/TunnelRefusedException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/TunnelRefusedException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/TunnelRefusedException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/TunnelRefusedException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/WinHttpClients.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/WinHttpClients.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/WinHttpClients.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/WinHttpClients.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractClientConnAdapter.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractClientConnAdapter.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractClientConnAdapter.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractClientConnAdapter.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractPoolEntry.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractPoolEntry.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractPoolEntry.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractPoolEntry.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractPooledConnAdapter.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractPooledConnAdapter.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractPooledConnAdapter.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractPooledConnAdapter.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/BasicClientConnectionManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/BasicClientConnectionManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/BasicClientConnectionManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/BasicClientConnectionManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/BasicHttpClientConnectionManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/BasicHttpClientConnectionManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/BasicHttpClientConnectionManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/BasicHttpClientConnectionManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ConnectionShutdownException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ConnectionShutdownException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ConnectionShutdownException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ConnectionShutdownException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultClientConnection.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultClientConnection.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultClientConnection.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultClientConnection.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultClientConnectionOperator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultClientConnectionOperator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultClientConnectionOperator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultClientConnectionOperator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpClientConnectionOperator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpClientConnectionOperator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpClientConnectionOperator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpClientConnectionOperator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpResponseParser.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpResponseParser.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpResponseParser.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpResponseParser.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpRoutePlanner.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpRoutePlanner.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpRoutePlanner.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpRoutePlanner.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultManagedHttpClientConnection.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultManagedHttpClientConnection.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultManagedHttpClientConnection.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultManagedHttpClientConnection.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultProxyRoutePlanner.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultProxyRoutePlanner.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultProxyRoutePlanner.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultProxyRoutePlanner.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultResponseParser.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultResponseParser.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultResponseParser.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultResponseParser.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultRoutePlanner.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultRoutePlanner.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultRoutePlanner.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultRoutePlanner.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultSchemePortResolver.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultSchemePortResolver.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultSchemePortResolver.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultSchemePortResolver.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/IdleConnectionHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/IdleConnectionHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/IdleConnectionHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/IdleConnectionHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/InMemoryDnsResolver.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/InMemoryDnsResolver.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/InMemoryDnsResolver.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/InMemoryDnsResolver.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/LoggingSessionInputBuffer.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/LoggingSessionInputBuffer.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/LoggingSessionInputBuffer.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/LoggingSessionInputBuffer.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/LoggingSessionOutputBuffer.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/LoggingSessionOutputBuffer.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/LoggingSessionOutputBuffer.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/LoggingSessionOutputBuffer.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ManagedHttpClientConnectionFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ManagedHttpClientConnectionFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ManagedHttpClientConnectionFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ManagedHttpClientConnectionFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/PoolingClientConnectionManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/PoolingClientConnectionManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/PoolingClientConnectionManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/PoolingClientConnectionManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ProxySelectorRoutePlanner.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ProxySelectorRoutePlanner.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ProxySelectorRoutePlanner.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ProxySelectorRoutePlanner.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SchemeRegistryFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SchemeRegistryFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SchemeRegistryFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SchemeRegistryFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.ConnAdapter.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.ConnAdapter.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.ConnAdapter.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.ConnAdapter.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.PoolEntry.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.PoolEntry.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.PoolEntry.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.PoolEntry.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SystemDefaultDnsResolver.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SystemDefaultDnsResolver.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SystemDefaultDnsResolver.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SystemDefaultDnsResolver.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SystemDefaultRoutePlanner.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SystemDefaultRoutePlanner.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SystemDefaultRoutePlanner.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SystemDefaultRoutePlanner.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/Wire.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/Wire.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/Wire.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/Wire.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractClientConnAdapter.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractClientConnAdapter.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractClientConnAdapter.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractClientConnAdapter.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractPoolEntry.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractPoolEntry.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractPoolEntry.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractPoolEntry.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractPooledConnAdapter.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractPooledConnAdapter.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractPooledConnAdapter.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractPooledConnAdapter.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/BasicClientConnectionManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/BasicClientConnectionManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/BasicClientConnectionManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/BasicClientConnectionManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/BasicHttpClientConnectionManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/BasicHttpClientConnectionManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/BasicHttpClientConnectionManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/BasicHttpClientConnectionManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ConnectionShutdownException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ConnectionShutdownException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ConnectionShutdownException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ConnectionShutdownException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultClientConnection.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultClientConnection.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultClientConnection.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultClientConnection.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultClientConnectionOperator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultClientConnectionOperator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultClientConnectionOperator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultClientConnectionOperator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpClientConnectionOperator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpClientConnectionOperator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpClientConnectionOperator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpClientConnectionOperator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpResponseParser.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpResponseParser.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpResponseParser.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpResponseParser.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpResponseParserFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpResponseParserFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpResponseParserFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpResponseParserFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpRoutePlanner.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpRoutePlanner.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpRoutePlanner.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpRoutePlanner.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultManagedHttpClientConnection.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultManagedHttpClientConnection.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultManagedHttpClientConnection.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultManagedHttpClientConnection.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultProxyRoutePlanner.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultProxyRoutePlanner.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultProxyRoutePlanner.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultProxyRoutePlanner.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultResponseParser.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultResponseParser.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultResponseParser.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultResponseParser.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultRoutePlanner.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultRoutePlanner.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultRoutePlanner.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultRoutePlanner.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultSchemePortResolver.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultSchemePortResolver.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultSchemePortResolver.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultSchemePortResolver.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/IdleConnectionHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/IdleConnectionHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/IdleConnectionHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/IdleConnectionHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/InMemoryDnsResolver.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/InMemoryDnsResolver.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/InMemoryDnsResolver.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/InMemoryDnsResolver.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/LoggingSessionInputBuffer.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/LoggingSessionInputBuffer.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/LoggingSessionInputBuffer.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/LoggingSessionInputBuffer.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/LoggingSessionOutputBuffer.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/LoggingSessionOutputBuffer.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/LoggingSessionOutputBuffer.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/LoggingSessionOutputBuffer.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ManagedHttpClientConnectionFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ManagedHttpClientConnectionFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ManagedHttpClientConnectionFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ManagedHttpClientConnectionFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/PoolingClientConnectionManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/PoolingClientConnectionManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/PoolingClientConnectionManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/PoolingClientConnectionManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/PoolingHttpClientConnectionManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/PoolingHttpClientConnectionManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/PoolingHttpClientConnectionManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/PoolingHttpClientConnectionManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ProxySelectorRoutePlanner.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ProxySelectorRoutePlanner.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ProxySelectorRoutePlanner.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ProxySelectorRoutePlanner.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SchemeRegistryFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SchemeRegistryFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SchemeRegistryFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SchemeRegistryFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.ConnAdapter.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.ConnAdapter.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.ConnAdapter.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.ConnAdapter.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.PoolEntry.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.PoolEntry.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.PoolEntry.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.PoolEntry.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SystemDefaultDnsResolver.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SystemDefaultDnsResolver.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SystemDefaultDnsResolver.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SystemDefaultDnsResolver.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SystemDefaultRoutePlanner.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SystemDefaultRoutePlanner.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SystemDefaultRoutePlanner.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SystemDefaultRoutePlanner.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/Wire.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/Wire.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/Wire.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/Wire.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/AbstractConnPool.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/AbstractConnPool.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/AbstractConnPool.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/AbstractConnPool.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPoolEntry.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPoolEntry.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPoolEntry.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPoolEntry.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/PoolEntryRequest.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/PoolEntryRequest.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/PoolEntryRequest.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/PoolEntryRequest.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/RouteSpecificPool.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/RouteSpecificPool.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/RouteSpecificPool.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/RouteSpecificPool.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/WaitingThread.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/WaitingThread.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/WaitingThread.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/WaitingThread.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/AbstractConnPool.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/AbstractConnPool.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/AbstractConnPool.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/AbstractConnPool.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPoolEntry.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPoolEntry.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPoolEntry.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPoolEntry.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPoolEntryRef.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPoolEntryRef.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPoolEntryRef.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPoolEntryRef.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPooledConnAdapter.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPooledConnAdapter.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPooledConnAdapter.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPooledConnAdapter.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/ConnPoolByRoute.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/ConnPoolByRoute.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/ConnPoolByRoute.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/ConnPoolByRoute.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/PoolEntryRequest.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/PoolEntryRequest.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/PoolEntryRequest.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/PoolEntryRequest.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/RouteSpecificPool.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/RouteSpecificPool.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/RouteSpecificPool.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/RouteSpecificPool.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/ThreadSafeClientConnManager.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/ThreadSafeClientConnManager.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/ThreadSafeClientConnManager.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/ThreadSafeClientConnManager.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/WaitingThread.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/WaitingThread.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/WaitingThread.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/WaitingThread.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/WaitingThreadAborter.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/WaitingThreadAborter.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/WaitingThreadAborter.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/WaitingThreadAborter.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/AbstractCookieSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/AbstractCookieSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/AbstractCookieSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/AbstractCookieSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicClientCookie.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicClientCookie.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicClientCookie.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicClientCookie.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicClientCookie2.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicClientCookie2.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicClientCookie2.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicClientCookie2.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicCommentHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicCommentHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicCommentHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicCommentHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicDomainHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicDomainHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicDomainHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicDomainHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicExpiresHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicExpiresHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicExpiresHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicExpiresHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicMaxAgeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicMaxAgeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicMaxAgeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicMaxAgeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicPathHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicPathHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicPathHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicPathHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicSecureHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicSecureHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicSecureHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicSecureHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BestMatchSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BestMatchSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BestMatchSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BestMatchSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BestMatchSpecFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BestMatchSpecFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BestMatchSpecFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BestMatchSpecFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpecFactory.SecurityLevel.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpecFactory.SecurityLevel.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpecFactory.SecurityLevel.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpecFactory.SecurityLevel.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpecFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpecFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpecFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpecFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/CookieSpecBase.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/CookieSpecBase.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/CookieSpecBase.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/CookieSpecBase.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DateParseException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DateParseException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DateParseException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DateParseException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DateUtils.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DateUtils.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DateUtils.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DateUtils.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpecProvider.CompatibilityLevel.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpecProvider.CompatibilityLevel.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpecProvider.CompatibilityLevel.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpecProvider.CompatibilityLevel.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpecProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpecProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpecProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpecProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpecFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpecFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpecFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpecFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpecProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpecProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpecProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpecProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/LaxExpiresHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/LaxExpiresHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/LaxExpiresHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/LaxExpiresHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/LaxMaxAgeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/LaxMaxAgeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/LaxMaxAgeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/LaxMaxAgeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDomainHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDomainHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDomainHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDomainHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftHeaderParser.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftHeaderParser.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftHeaderParser.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftHeaderParser.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpecProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpecProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpecProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpecProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixDomainFilter.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixDomainFilter.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixDomainFilter.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixDomainFilter.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixFilter.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixFilter.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixFilter.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixFilter.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixListParser.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixListParser.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixListParser.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixListParser.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109DomainHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109DomainHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109DomainHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109DomainHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109Spec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109Spec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109Spec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109Spec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109SpecFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109SpecFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109SpecFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109SpecFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109SpecProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109SpecProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109SpecProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109SpecProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109VersionHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109VersionHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109VersionHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109VersionHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965Spec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965Spec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965Spec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965Spec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965SpecFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965SpecFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965SpecFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965SpecFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965SpecProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965SpecProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965SpecProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965SpecProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpecProvider.CompatibilityLevel.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpecProvider.CompatibilityLevel.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpecProvider.CompatibilityLevel.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpecProvider.CompatibilityLevel.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpecProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpecProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpecProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpecProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265LaxSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265LaxSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265LaxSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265LaxSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265StrictSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265StrictSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265StrictSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265StrictSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/AbstractCookieAttributeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/AbstractCookieAttributeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/AbstractCookieAttributeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/AbstractCookieAttributeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/AbstractCookieSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/AbstractCookieSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/AbstractCookieSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/AbstractCookieSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicClientCookie.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicClientCookie.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicClientCookie.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicClientCookie.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicClientCookie2.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicClientCookie2.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicClientCookie2.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicClientCookie2.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicCommentHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicCommentHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicCommentHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicCommentHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicDomainHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicDomainHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicDomainHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicDomainHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicExpiresHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicExpiresHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicExpiresHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicExpiresHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicMaxAgeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicMaxAgeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicMaxAgeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicMaxAgeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicPathHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicPathHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicPathHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicPathHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicSecureHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicSecureHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicSecureHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicSecureHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BestMatchSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BestMatchSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BestMatchSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BestMatchSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BestMatchSpecFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BestMatchSpecFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BestMatchSpecFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BestMatchSpecFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpecFactory.SecurityLevel.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpecFactory.SecurityLevel.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpecFactory.SecurityLevel.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpecFactory.SecurityLevel.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpecFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpecFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpecFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpecFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatVersionAttributeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatVersionAttributeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatVersionAttributeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatVersionAttributeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/CookieSpecBase.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/CookieSpecBase.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/CookieSpecBase.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/CookieSpecBase.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DateParseException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DateParseException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DateParseException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DateParseException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DateUtils.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DateUtils.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DateUtils.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DateUtils.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpecProvider.CompatibilityLevel.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpecProvider.CompatibilityLevel.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpecProvider.CompatibilityLevel.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpecProvider.CompatibilityLevel.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpecProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpecProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpecProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpecProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpecFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpecFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpecFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpecFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpecProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpecProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpecProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpecProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/LaxExpiresHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/LaxExpiresHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/LaxExpiresHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/LaxExpiresHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/LaxMaxAgeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/LaxMaxAgeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/LaxMaxAgeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/LaxMaxAgeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDomainHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDomainHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDomainHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDomainHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftHeaderParser.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftHeaderParser.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftHeaderParser.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftHeaderParser.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpecFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpecFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpecFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpecFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpecProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpecProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpecProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpecProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixDomainFilter.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixDomainFilter.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixDomainFilter.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixDomainFilter.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixFilter.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixFilter.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixFilter.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixFilter.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixListParser.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixListParser.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixListParser.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixListParser.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109DomainHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109DomainHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109DomainHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109DomainHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109Spec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109Spec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109Spec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109Spec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109SpecFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109SpecFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109SpecFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109SpecFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109SpecProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109SpecProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109SpecProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109SpecProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109VersionHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109VersionHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109VersionHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109VersionHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965CommentUrlAttributeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965CommentUrlAttributeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965CommentUrlAttributeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965CommentUrlAttributeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965DiscardAttributeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965DiscardAttributeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965DiscardAttributeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965DiscardAttributeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965DomainAttributeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965DomainAttributeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965DomainAttributeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965DomainAttributeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965PortAttributeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965PortAttributeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965PortAttributeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965PortAttributeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965Spec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965Spec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965Spec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965Spec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965SpecFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965SpecFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965SpecFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965SpecFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965SpecProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965SpecProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965SpecProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965SpecProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965VersionAttributeHandler.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965VersionAttributeHandler.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965VersionAttributeHandler.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965VersionAttributeHandler.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpecProvider.CompatibilityLevel.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpecProvider.CompatibilityLevel.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpecProvider.CompatibilityLevel.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpecProvider.CompatibilityLevel.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpecProvider.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpecProvider.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpecProvider.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpecProvider.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265LaxSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265LaxSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265LaxSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265LaxSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265StrictSpec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265StrictSpec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265StrictSpec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265StrictSpec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/BackoffStrategyExec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/BackoffStrategyExec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/BackoffStrategyExec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/BackoffStrategyExec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ClientExecChain.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ClientExecChain.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ClientExecChain.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ClientExecChain.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/MainClientExec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/MainClientExec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/MainClientExec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/MainClientExec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/MinimalClientExec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/MinimalClientExec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/MinimalClientExec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/MinimalClientExec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ProtocolExec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ProtocolExec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ProtocolExec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ProtocolExec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RedirectExec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RedirectExec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RedirectExec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RedirectExec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RequestAbortedException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RequestAbortedException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RequestAbortedException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RequestAbortedException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RetryExec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RetryExec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RetryExec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RetryExec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ServiceUnavailableRetryExec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ServiceUnavailableRetryExec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ServiceUnavailableRetryExec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ServiceUnavailableRetryExec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/TunnelRefusedException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/TunnelRefusedException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/TunnelRefusedException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/TunnelRefusedException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/BackoffStrategyExec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/BackoffStrategyExec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/BackoffStrategyExec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/BackoffStrategyExec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ClientExecChain.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ClientExecChain.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ClientExecChain.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ClientExecChain.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/MainClientExec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/MainClientExec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/MainClientExec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/MainClientExec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/MinimalClientExec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/MinimalClientExec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/MinimalClientExec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/MinimalClientExec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ProtocolExec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ProtocolExec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ProtocolExec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ProtocolExec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RedirectExec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RedirectExec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RedirectExec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RedirectExec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RequestAbortedException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RequestAbortedException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RequestAbortedException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RequestAbortedException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RetryExec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RetryExec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RetryExec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RetryExec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ServiceUnavailableRetryExec.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ServiceUnavailableRetryExec.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ServiceUnavailableRetryExec.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ServiceUnavailableRetryExec.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/TunnelRefusedException.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/TunnelRefusedException.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/TunnelRefusedException.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/TunnelRefusedException.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/HttpProxyConfigurationActivator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/HttpProxyConfigurationActivator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/HttpProxyConfigurationActivator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/HttpProxyConfigurationActivator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/OSGiClientBuilderFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/OSGiClientBuilderFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/OSGiClientBuilderFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/OSGiClientBuilderFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/OSGiProxyConfiguration.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/OSGiProxyConfiguration.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/OSGiProxyConfiguration.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/OSGiProxyConfiguration.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/HttpProxyConfigurationActivator.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/HttpProxyConfigurationActivator.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/HttpProxyConfigurationActivator.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/HttpProxyConfigurationActivator.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/OSGiClientBuilderFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/OSGiClientBuilderFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/OSGiClientBuilderFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/OSGiClientBuilderFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/OSGiProxyConfiguration.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/OSGiProxyConfiguration.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/OSGiProxyConfiguration.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/OSGiProxyConfiguration.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/CachingHttpClientBuilderFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/CachingHttpClientBuilderFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/CachingHttpClientBuilderFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/CachingHttpClientBuilderFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/HttpClientBuilderFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/HttpClientBuilderFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/HttpClientBuilderFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/HttpClientBuilderFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/ProxyConfiguration.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/ProxyConfiguration.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/ProxyConfiguration.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/ProxyConfiguration.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/CachingHttpClientBuilderFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/CachingHttpClientBuilderFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/CachingHttpClientBuilderFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/CachingHttpClientBuilderFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/HttpClientBuilderFactory.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/HttpClientBuilderFactory.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/HttpClientBuilderFactory.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/HttpClientBuilderFactory.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/ProxyConfiguration.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/ProxyConfiguration.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/ProxyConfiguration.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/ProxyConfiguration.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-use.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-use.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-use.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-use.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/overview-frame.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/overview-frame.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/overview-frame.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/overview-frame.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/overview-summary.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/overview-summary.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/overview-summary.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/overview-summary.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/overview-tree.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/overview-tree.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/overview-tree.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/overview-tree.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/package-list b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/package-list similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/package-list rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/package-list diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/resources/background.gif b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/resources/background.gif similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/resources/background.gif rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/resources/background.gif diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/resources/tab.gif b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/resources/tab.gif similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/resources/tab.gif rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/resources/tab.gif diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/resources/titlebar.gif b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/resources/titlebar.gif similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/resources/titlebar.gif rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/resources/titlebar.gif diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/resources/titlebar_end.gif b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/resources/titlebar_end.gif similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/resources/titlebar_end.gif rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/resources/titlebar_end.gif diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/serialized-form.html b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/serialized-form.html similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/serialized-form.html rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/serialized-form.html diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/stylesheet.css b/src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/stylesheet.css similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/javadoc/stylesheet.css rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/javadoc/stylesheet.css diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/commons-codec-1.11.jar b/src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/commons-codec-1.11.jar similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/commons-codec-1.11.jar rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/commons-codec-1.11.jar diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/commons-logging-1.2.jar b/src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/commons-logging-1.2.jar similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/commons-logging-1.2.jar rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/commons-logging-1.2.jar diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/fluent-hc-4.5.14.jar b/src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/fluent-hc-4.5.14.jar similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/fluent-hc-4.5.14.jar rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/fluent-hc-4.5.14.jar diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/httpclient-4.5.14.jar b/src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/httpclient-4.5.14.jar similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/httpclient-4.5.14.jar rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/httpclient-4.5.14.jar diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/httpclient-cache-4.5.14.jar b/src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/httpclient-cache-4.5.14.jar similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/httpclient-cache-4.5.14.jar rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/httpclient-cache-4.5.14.jar diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/httpclient-osgi-4.5.14.jar b/src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/httpclient-osgi-4.5.14.jar similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/httpclient-osgi-4.5.14.jar rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/httpclient-osgi-4.5.14.jar diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/httpclient-win-4.5.14.jar b/src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/httpclient-win-4.5.14.jar similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/httpclient-win-4.5.14.jar rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/httpclient-win-4.5.14.jar diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/httpcore-4.4.16.jar b/src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/httpcore-4.4.16.jar similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/httpcore-4.4.16.jar rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/httpcore-4.4.16.jar diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/httpmime-4.5.14.jar b/src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/httpmime-4.5.14.jar similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/httpmime-4.5.14.jar rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/httpmime-4.5.14.jar diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/jna-4.5.2.jar b/src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/jna-4.5.2.jar similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/jna-4.5.2.jar rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/jna-4.5.2.jar diff --git a/src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/jna-platform-4.5.2.jar b/src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/jna-platform-4.5.2.jar similarity index 100% rename from src/Notesmaster2/httpcomponents-client-4.5.14-bin/lib/jna-platform-4.5.2.jar rename to src/Notesmaster/httpcomponents-client-4.5.14-bin/lib/jna-platform-4.5.2.jar diff --git a/src/Notesmaster2/settings.gradle.kts b/src/Notesmaster/settings.gradle.kts similarity index 99% rename from src/Notesmaster2/settings.gradle.kts rename to src/Notesmaster/settings.gradle.kts index fb359fe..bcbfede 100644 --- a/src/Notesmaster2/settings.gradle.kts +++ b/src/Notesmaster/settings.gradle.kts @@ -21,4 +21,3 @@ dependencyResolutionManagement { rootProject.name = "Notes-master" include(":app") - \ No newline at end of file diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/data/Contact.java b/src/Notesmaster2/app/src/main/java/net/micode/notes/data/Contact.java deleted file mode 100644 index d97ac5d..0000000 --- a/src/Notesmaster2/app/src/main/java/net/micode/notes/data/Contact.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.data; - -import android.content.Context; -import android.database.Cursor; -import android.provider.ContactsContract.CommonDataKinds.Phone; -import android.provider.ContactsContract.Data; -import android.telephony.PhoneNumberUtils; -import android.util.Log; - -import java.util.HashMap; - -public class Contact { - private static HashMap sContactCache; - private static final String TAG = "Contact"; - - private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER - + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" - + " AND " + Data.RAW_CONTACT_ID + " IN " - + "(SELECT raw_contact_id " - + " FROM phone_lookup" - + " WHERE min_match = '+')"; - - public static String getContact(Context context, String phoneNumber) { - if(sContactCache == null) { - sContactCache = new HashMap(); - } - - if(sContactCache.containsKey(phoneNumber)) { - return sContactCache.get(phoneNumber); - } - - String selection = CALLER_ID_SELECTION.replace("+", - PhoneNumberUtils.toCallerIDMinMatch(phoneNumber)); - Cursor cursor = context.getContentResolver().query( - Data.CONTENT_URI, - new String [] { Phone.DISPLAY_NAME }, - selection, - new String[] { phoneNumber }, - null); - - if (cursor != null && cursor.moveToFirst()) { - try { - String name = cursor.getString(0); - sContactCache.put(phoneNumber, name); - return name; - } catch (IndexOutOfBoundsException e) { - Log.e(TAG, " Cursor get string error " + e.toString()); - return null; - } finally { - cursor.close(); - } - } else { - Log.d(TAG, "No contact matched with number:" + phoneNumber); - return null; - } - } -} diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notesmaster2/app/src/main/java/net/micode/notes/data/Notes.java deleted file mode 100644 index f240604..0000000 --- a/src/Notesmaster2/app/src/main/java/net/micode/notes/data/Notes.java +++ /dev/null @@ -1,279 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.data; - -import android.net.Uri; -public class Notes { - public static final String AUTHORITY = "micode_notes"; - public static final String TAG = "Notes"; - public static final int TYPE_NOTE = 0; - public static final int TYPE_FOLDER = 1; - public static final int TYPE_SYSTEM = 2; - - /** - * Following IDs are system folders' identifiers - * {@link Notes#ID_ROOT_FOLDER } is default folder - * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder - * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records - */ - public static final int ID_ROOT_FOLDER = 0; - public static final int ID_TEMPARAY_FOLDER = -1; - public static final int ID_CALL_RECORD_FOLDER = -2; - public static final int ID_TRASH_FOLER = -3; - - public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date"; - public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id"; - public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id"; - public static final String INTENT_EXTRA_WIDGET_TYPE = "net.micode.notes.widget_type"; - public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id"; - public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date"; - - public static final int TYPE_WIDGET_INVALIDE = -1; - public static final int TYPE_WIDGET_2X = 0; - public static final int TYPE_WIDGET_4X = 1; - - public static class DataConstants { - public static final String NOTE = TextNote.CONTENT_ITEM_TYPE; - public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE; - } - - /** - * Uri to query all notes and folders - */ - public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note"); - - /** - * Uri to query data - */ - public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data"); - - public interface NoteColumns { - /** - * The unique ID for a row - *

Type: INTEGER (long)

- */ - public static final String ID = "_id"; - - /** - * The parent's id for note or folder - *

Type: INTEGER (long)

- */ - public static final String PARENT_ID = "parent_id"; - - /** - * Created data for note or folder - *

Type: INTEGER (long)

- */ - public static final String CREATED_DATE = "created_date"; - - /** - * Latest modified date - *

Type: INTEGER (long)

- */ - public static final String MODIFIED_DATE = "modified_date"; - - - /** - * Alert date - *

Type: INTEGER (long)

- */ - public static final String ALERTED_DATE = "alert_date"; - - /** - * Folder's name or text content of note - *

Type: TEXT

- */ - public static final String SNIPPET = "snippet"; - - /** - * Note's widget id - *

Type: INTEGER (long)

- */ - public static final String WIDGET_ID = "widget_id"; - - /** - * Note's widget type - *

Type: INTEGER (long)

- */ - public static final String WIDGET_TYPE = "widget_type"; - - /** - * Note's background color's id - *

Type: INTEGER (long)

- */ - public static final String BG_COLOR_ID = "bg_color_id"; - - /** - * For text note, it doesn't has attachment, for multi-media - * note, it has at least one attachment - *

Type: INTEGER

- */ - public static final String HAS_ATTACHMENT = "has_attachment"; - - /** - * Folder's count of notes - *

Type: INTEGER (long)

- */ - public static final String NOTES_COUNT = "notes_count"; - - /** - * The file type: folder or note - *

Type: INTEGER

- */ - public static final String TYPE = "type"; - - /** - * The last sync id - *

Type: INTEGER (long)

- */ - public static final String SYNC_ID = "sync_id"; - - /** - * Sign to indicate local modified or not - *

Type: INTEGER

- */ - public static final String LOCAL_MODIFIED = "local_modified"; - - /** - * Original parent id before moving into temporary folder - *

Type : INTEGER

- */ - public static final String ORIGIN_PARENT_ID = "origin_parent_id"; - - /** - * The gtask id - *

Type : TEXT

- */ - public static final String GTASK_ID = "gtask_id"; - - /** - * The version code - *

Type : INTEGER (long)

- */ - public static final String VERSION = "version"; - } - - public interface DataColumns { - /** - * The unique ID for a row - *

Type: INTEGER (long)

- */ - public static final String ID = "_id"; - - /** - * The MIME type of the item represented by this row. - *

Type: Text

- */ - public static final String MIME_TYPE = "mime_type"; - - /** - * The reference id to note that this data belongs to - *

Type: INTEGER (long)

- */ - public static final String NOTE_ID = "note_id"; - - /** - * Created data for note or folder - *

Type: INTEGER (long)

- */ - public static final String CREATED_DATE = "created_date"; - - /** - * Latest modified date - *

Type: INTEGER (long)

- */ - public static final String MODIFIED_DATE = "modified_date"; - - /** - * Data's content - *

Type: TEXT

- */ - public static final String CONTENT = "content"; - - - /** - * Generic data column, the meaning is {@link #MIMETYPE} specific, used for - * integer data type - *

Type: INTEGER

- */ - public static final String DATA1 = "data1"; - - /** - * Generic data column, the meaning is {@link #MIMETYPE} specific, used for - * integer data type - *

Type: INTEGER

- */ - public static final String DATA2 = "data2"; - - /** - * Generic data column, the meaning is {@link #MIMETYPE} specific, used for - * TEXT data type - *

Type: TEXT

- */ - public static final String DATA3 = "data3"; - - /** - * Generic data column, the meaning is {@link #MIMETYPE} specific, used for - * TEXT data type - *

Type: TEXT

- */ - public static final String DATA4 = "data4"; - - /** - * Generic data column, the meaning is {@link #MIMETYPE} specific, used for - * TEXT data type - *

Type: TEXT

- */ - public static final String DATA5 = "data5"; - } - - public static final class TextNote implements DataColumns { - /** - * Mode to indicate the text in check list mode or not - *

Type: Integer 1:check list mode 0: normal mode

- */ - public static final String MODE = DATA1; - - public static final int MODE_CHECK_LIST = 1; - - public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note"; - - public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note"; - - public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note"); - } - - public static final class CallNote implements DataColumns { - /** - * Call date for this record - *

Type: INTEGER (long)

- */ - public static final String CALL_DATE = DATA1; - - /** - * Phone number for this record - *

Type: TEXT

- */ - public static final String PHONE_NUMBER = DATA3; - - public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note"; - - public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note"; - - public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note"); - } -} diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notesmaster2/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java deleted file mode 100644 index ffe5d57..0000000 --- a/src/Notesmaster2/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java +++ /dev/null @@ -1,362 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.data; - -import android.content.ContentValues; -import android.content.Context; -import android.database.sqlite.SQLiteDatabase; -import android.database.sqlite.SQLiteOpenHelper; -import android.util.Log; - -import net.micode.notes.data.Notes.DataColumns; -import net.micode.notes.data.Notes.DataConstants; -import net.micode.notes.data.Notes.NoteColumns; - - -public class NotesDatabaseHelper extends SQLiteOpenHelper { - private static final String DB_NAME = "note.db"; - - private static final int DB_VERSION = 4; - - public interface TABLE { - public static final String NOTE = "note"; - - public static final String DATA = "data"; - } - - private static final String TAG = "NotesDatabaseHelper"; - - private static NotesDatabaseHelper mInstance; - - private static final String CREATE_NOTE_TABLE_SQL = - "CREATE TABLE " + TABLE.NOTE + "(" + - NoteColumns.ID + " INTEGER PRIMARY KEY," + - NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," + - NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," + - NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + - NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + - ")"; - - private static final String CREATE_DATA_TABLE_SQL = - "CREATE TABLE " + TABLE.DATA + "(" + - DataColumns.ID + " INTEGER PRIMARY KEY," + - DataColumns.MIME_TYPE + " TEXT NOT NULL," + - DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," + - DataColumns.DATA1 + " INTEGER," + - DataColumns.DATA2 + " INTEGER," + - DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," + - DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," + - DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + - ")"; - - private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = - "CREATE INDEX IF NOT EXISTS note_id_index ON " + - TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; - - /** - * Increase folder's note count when move note to the folder - */ - private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = - "CREATE TRIGGER increase_folder_count_on_update "+ - " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + - " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + - " END"; - - /** - * Decrease folder's note count when move note from folder - */ - private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = - "CREATE TRIGGER decrease_folder_count_on_update " + - " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + - " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + - " AND " + NoteColumns.NOTES_COUNT + ">0" + ";" + - " END"; - - /** - * Increase folder's note count when insert new note to the folder - */ - private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = - "CREATE TRIGGER increase_folder_count_on_insert " + - " AFTER INSERT ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + - " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + - " END"; - - /** - * Decrease folder's note count when delete note from the folder - */ - private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = - "CREATE TRIGGER decrease_folder_count_on_delete " + - " AFTER DELETE ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + - " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + - " AND " + NoteColumns.NOTES_COUNT + ">0;" + - " END"; - - /** - * Update note's content when insert data with type {@link DataConstants#NOTE} - */ - private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = - "CREATE TRIGGER update_note_content_on_insert " + - " AFTER INSERT ON " + TABLE.DATA + - " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + - " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + - " END"; - - /** - * Update note's content when data with {@link DataConstants#NOTE} type has changed - */ - private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER = - "CREATE TRIGGER update_note_content_on_update " + - " AFTER UPDATE ON " + TABLE.DATA + - " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + - " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + - " END"; - - /** - * Update note's content when data with {@link DataConstants#NOTE} type has deleted - */ - private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER = - "CREATE TRIGGER update_note_content_on_delete " + - " AFTER delete ON " + TABLE.DATA + - " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.SNIPPET + "=''" + - " WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" + - " END"; - - /** - * Delete datas belong to note which has been deleted - */ - private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER = - "CREATE TRIGGER delete_data_on_delete " + - " AFTER DELETE ON " + TABLE.NOTE + - " BEGIN" + - " DELETE FROM " + TABLE.DATA + - " WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" + - " END"; - - /** - * Delete notes belong to folder which has been deleted - */ - private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER = - "CREATE TRIGGER folder_delete_notes_on_delete " + - " AFTER DELETE ON " + TABLE.NOTE + - " BEGIN" + - " DELETE FROM " + TABLE.NOTE + - " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + - " END"; - - /** - * Move notes belong to folder which has been moved to trash folder - */ - private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER = - "CREATE TRIGGER folder_move_notes_on_trash " + - " AFTER UPDATE ON " + TABLE.NOTE + - " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + - " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + - " END"; - - public NotesDatabaseHelper(Context context) { - super(context, DB_NAME, null, DB_VERSION); - } - - public void createNoteTable(SQLiteDatabase db) { - db.execSQL(CREATE_NOTE_TABLE_SQL); - reCreateNoteTableTriggers(db); - createSystemFolder(db); - Log.d(TAG, "note table has been created"); - } - - private void reCreateNoteTableTriggers(SQLiteDatabase db) { - db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update"); - db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update"); - db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_delete"); - db.execSQL("DROP TRIGGER IF EXISTS delete_data_on_delete"); - db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_insert"); - db.execSQL("DROP TRIGGER IF EXISTS folder_delete_notes_on_delete"); - db.execSQL("DROP TRIGGER IF EXISTS folder_move_notes_on_trash"); - - db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER); - db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER); - db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER); - db.execSQL(NOTE_DELETE_DATA_ON_DELETE_TRIGGER); - db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER); - db.execSQL(FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER); - db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER); - } - - private void createSystemFolder(SQLiteDatabase db) { - ContentValues values = new ContentValues(); - - /** - * call record foler for call notes - */ - values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER); - values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); - db.insert(TABLE.NOTE, null, values); - - /** - * root folder which is default folder - */ - values.clear(); - values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER); - values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); - db.insert(TABLE.NOTE, null, values); - - /** - * temporary folder which is used for moving note - */ - values.clear(); - values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER); - values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); - db.insert(TABLE.NOTE, null, values); - - /** - * create trash folder - */ - values.clear(); - values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER); - values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); - db.insert(TABLE.NOTE, null, values); - } - - public void createDataTable(SQLiteDatabase db) { - db.execSQL(CREATE_DATA_TABLE_SQL); - reCreateDataTableTriggers(db); - db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL); - Log.d(TAG, "data table has been created"); - } - - private void reCreateDataTableTriggers(SQLiteDatabase db) { - db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert"); - db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update"); - db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_delete"); - - db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER); - db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER); - db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER); - } - - static synchronized NotesDatabaseHelper getInstance(Context context) { - if (mInstance == null) { - mInstance = new NotesDatabaseHelper(context); - } - return mInstance; - } - - @Override - public void onCreate(SQLiteDatabase db) { - createNoteTable(db); - createDataTable(db); - } - - @Override - public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - boolean reCreateTriggers = false; - boolean skipV2 = false; - - if (oldVersion == 1) { - upgradeToV2(db); - skipV2 = true; // this upgrade including the upgrade from v2 to v3 - oldVersion++; - } - - if (oldVersion == 2 && !skipV2) { - upgradeToV3(db); - reCreateTriggers = true; - oldVersion++; - } - - if (oldVersion == 3) { - upgradeToV4(db); - oldVersion++; - } - - if (reCreateTriggers) { - reCreateNoteTableTriggers(db); - reCreateDataTableTriggers(db); - } - - if (oldVersion != newVersion) { - throw new IllegalStateException("Upgrade notes database to version " + newVersion - + "fails"); - } - } - - private void upgradeToV2(SQLiteDatabase db) { - db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE); - db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA); - createNoteTable(db); - createDataTable(db); - } - - private void upgradeToV3(SQLiteDatabase db) { - // drop unused triggers - db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert"); - db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_delete"); - db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_update"); - // add a column for gtask id - db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID - + " TEXT NOT NULL DEFAULT ''"); - // add a trash system folder - ContentValues values = new ContentValues(); - values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER); - values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); - db.insert(TABLE.NOTE, null, values); - } - - private void upgradeToV4(SQLiteDatabase db) { - db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION - + " INTEGER NOT NULL DEFAULT 0"); - } -} diff --git a/src/Notesmaster2/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/Notesmaster2/app/src/main/java/net/micode/notes/data/NotesProvider.java deleted file mode 100644 index edb0a60..0000000 --- a/src/Notesmaster2/app/src/main/java/net/micode/notes/data/NotesProvider.java +++ /dev/null @@ -1,305 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.data; - - -import android.app.SearchManager; -import android.content.ContentProvider; -import android.content.ContentUris; -import android.content.ContentValues; -import android.content.Intent; -import android.content.UriMatcher; -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; -import android.net.Uri; -import android.text.TextUtils; -import android.util.Log; - -import net.micode.notes.R; -import net.micode.notes.data.Notes.DataColumns; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.data.NotesDatabaseHelper.TABLE; - - -public class NotesProvider extends ContentProvider { - private static final UriMatcher mMatcher; - - private NotesDatabaseHelper mHelper; - - private static final String TAG = "NotesProvider"; - - private static final int URI_NOTE = 1; - private static final int URI_NOTE_ITEM = 2; - private static final int URI_DATA = 3; - private static final int URI_DATA_ITEM = 4; - - private static final int URI_SEARCH = 5; - private static final int URI_SEARCH_SUGGEST = 6; - - static { - mMatcher = new UriMatcher(UriMatcher.NO_MATCH); - mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE); - mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM); - mMatcher.addURI(Notes.AUTHORITY, "data", URI_DATA); - mMatcher.addURI(Notes.AUTHORITY, "data/#", URI_DATA_ITEM); - mMatcher.addURI(Notes.AUTHORITY, "search", URI_SEARCH); - mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY, URI_SEARCH_SUGGEST); - mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", URI_SEARCH_SUGGEST); - } - - /** - * x'0A' represents the '\n' character in sqlite. For title and content in the search result, - * we will trim '\n' and white space in order to show more information. - */ - private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + "," - + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + "," - + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + "," - + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 + "," - + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + "," - + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + "," - + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA; - - private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION - + " FROM " + TABLE.NOTE - + " WHERE " + NoteColumns.SNIPPET + " LIKE ?" - + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER - + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE; - - @Override - public boolean onCreate() { - mHelper = NotesDatabaseHelper.getInstance(getContext()); - return true; - } - - @Override - public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, - String sortOrder) { - Cursor c = null; - SQLiteDatabase db = mHelper.getReadableDatabase(); - String id = null; - switch (mMatcher.match(uri)) { - case URI_NOTE: - c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null, - sortOrder); - break; - case URI_NOTE_ITEM: - id = uri.getPathSegments().get(1); - c = db.query(TABLE.NOTE, projection, NoteColumns.ID + "=" + id - + parseSelection(selection), selectionArgs, null, null, sortOrder); - break; - case URI_DATA: - c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null, - sortOrder); - break; - case URI_DATA_ITEM: - id = uri.getPathSegments().get(1); - c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id - + parseSelection(selection), selectionArgs, null, null, sortOrder); - break; - case URI_SEARCH: - case URI_SEARCH_SUGGEST: - if (sortOrder != null || projection != null) { - throw new IllegalArgumentException( - "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query"); - } - - String searchString = null; - if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) { - if (uri.getPathSegments().size() > 1) { - searchString = uri.getPathSegments().get(1); - } - } else { - searchString = uri.getQueryParameter("pattern"); - } - - if (TextUtils.isEmpty(searchString)) { - return null; - } - - try { - searchString = String.format("%%%s%%", searchString); - c = db.rawQuery(NOTES_SNIPPET_SEARCH_QUERY, - new String[] { searchString }); - } catch (IllegalStateException ex) { - Log.e(TAG, "got exception: " + ex.toString()); - } - break; - default: - throw new IllegalArgumentException("Unknown URI " + uri); - } - if (c != null) { - c.setNotificationUri(getContext().getContentResolver(), uri); - } - return c; - } - - @Override - public Uri insert(Uri uri, ContentValues values) { - SQLiteDatabase db = mHelper.getWritableDatabase(); - long dataId = 0, noteId = 0, insertedId = 0; - switch (mMatcher.match(uri)) { - case URI_NOTE: - insertedId = noteId = db.insert(TABLE.NOTE, null, values); - break; - case URI_DATA: - if (values.containsKey(DataColumns.NOTE_ID)) { - noteId = values.getAsLong(DataColumns.NOTE_ID); - } else { - Log.d(TAG, "Wrong data format without note id:" + values.toString()); - } - insertedId = dataId = db.insert(TABLE.DATA, null, values); - break; - default: - throw new IllegalArgumentException("Unknown URI " + uri); - } - // Notify the note uri - if (noteId > 0) { - getContext().getContentResolver().notifyChange( - ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null); - } - - // Notify the data uri - if (dataId > 0) { - getContext().getContentResolver().notifyChange( - ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null); - } - - return ContentUris.withAppendedId(uri, insertedId); - } - - @Override - public int delete(Uri uri, String selection, String[] selectionArgs) { - int count = 0; - String id = null; - SQLiteDatabase db = mHelper.getWritableDatabase(); - boolean deleteData = false; - switch (mMatcher.match(uri)) { - case URI_NOTE: - selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 "; - count = db.delete(TABLE.NOTE, selection, selectionArgs); - break; - case URI_NOTE_ITEM: - id = uri.getPathSegments().get(1); - /** - * ID that smaller than 0 is system folder which is not allowed to - * trash - */ - long noteId = Long.valueOf(id); - if (noteId <= 0) { - break; - } - count = db.delete(TABLE.NOTE, - NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs); - break; - case URI_DATA: - count = db.delete(TABLE.DATA, selection, selectionArgs); - deleteData = true; - break; - case URI_DATA_ITEM: - id = uri.getPathSegments().get(1); - count = db.delete(TABLE.DATA, - DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs); - deleteData = true; - break; - default: - throw new IllegalArgumentException("Unknown URI " + uri); - } - if (count > 0) { - if (deleteData) { - getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null); - } - getContext().getContentResolver().notifyChange(uri, null); - } - return count; - } - - @Override - public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { - int count = 0; - String id = null; - SQLiteDatabase db = mHelper.getWritableDatabase(); - boolean updateData = false; - switch (mMatcher.match(uri)) { - case URI_NOTE: - increaseNoteVersion(-1, selection, selectionArgs); - count = db.update(TABLE.NOTE, values, selection, selectionArgs); - break; - case URI_NOTE_ITEM: - id = uri.getPathSegments().get(1); - increaseNoteVersion(Long.valueOf(id), selection, selectionArgs); - count = db.update(TABLE.NOTE, values, NoteColumns.ID + "=" + id - + parseSelection(selection), selectionArgs); - break; - case URI_DATA: - count = db.update(TABLE.DATA, values, selection, selectionArgs); - updateData = true; - break; - case URI_DATA_ITEM: - id = uri.getPathSegments().get(1); - count = db.update(TABLE.DATA, values, DataColumns.ID + "=" + id - + parseSelection(selection), selectionArgs); - updateData = true; - break; - default: - throw new IllegalArgumentException("Unknown URI " + uri); - } - - if (count > 0) { - if (updateData) { - getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null); - } - getContext().getContentResolver().notifyChange(uri, null); - } - return count; - } - - private String parseSelection(String selection) { - return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""); - } - - private void increaseNoteVersion(long id, String selection, String[] selectionArgs) { - StringBuilder sql = new StringBuilder(120); - sql.append("UPDATE "); - sql.append(TABLE.NOTE); - sql.append(" SET "); - sql.append(NoteColumns.VERSION); - sql.append("=" + NoteColumns.VERSION + "+1 "); - - if (id > 0 || !TextUtils.isEmpty(selection)) { - sql.append(" WHERE "); - } - if (id > 0) { - sql.append(NoteColumns.ID + "=" + String.valueOf(id)); - } - if (!TextUtils.isEmpty(selection)) { - String selectString = id > 0 ? parseSelection(selection) : selection; - for (String args : selectionArgs) { - selectString = selectString.replaceFirst("\\?", args); - } - sql.append(selectString); - } - - mHelper.getWritableDatabase().execSQL(sql.toString()); - } - - @Override - public String getType(Uri uri) { - // TODO Auto-generated method stub - return null; - } - -}