diff --git a/.classpath b/.classpath
new file mode 100644
index 000000000..55dc68468
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="test"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="lib" path="lib/felix.jar"/>
+	<classpathentry kind="lib" path="lib/jdic-all.jar"/>
+	<classpathentry kind="lib" path="lib/bundle/junit.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/apache-ant-1.7.0.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/aclibico-2.1.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/commons-logging-1.1.1.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/concurrent.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/dict4j.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/dhcp4java-1.00.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/jmdns.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/fmj.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/jain-sip-api.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/jain-sip-ri.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/jcalendar-1.3.2.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/jdic_misc.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/jdom.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/jfontchooser-1.0.5.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/jmf.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/jml-1.0b5.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/jna.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/joscar-client.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/joscar-common.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/joscar-protocol.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/jsch-0.1.36.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/jsocks-klea.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/json-20090723.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/jspeex.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/junit.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/laf-widget.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/libphonenumber-2.4.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/log4j-1.2.8.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/lti-civil-no_s_w_t.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/jain-sdp.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="https://hudson.jboss.org/jenkins/job/jain-sip/lastStableBuild/artifact/javadoc/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/installer-exclude/pircbot.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/profiler4j-1.0-beta3-SC.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/rome-0.9.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/smack.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/smackx.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/ice4j.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/swing-worker-1.2.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/transparency.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/ymsg_network_v0_67.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/zrtp4j-light.jar"/>
+	<classpathentry kind="lib" path="lib/os-specific/linux/installer-exclude/jmf.jar"/>
+	<classpathentry kind="lib" path="lib/os-specific/linux/jdic_stub.jar"/>
+	<classpathentry kind="lib" path="lib/os-specific/mac/installer-exclude/jmf.jar"/>
+	<classpathentry kind="lib" path="lib/os-specific/mac/OrangeExtensions.jar"/>
+	<classpathentry kind="lib" path="lib/os-specific/mac/growl4j.jar"/>
+	<classpathentry kind="lib" path="lib/os-specific/mac/jdic_stub.jar"/>
+	<classpathentry kind="lib" path="lib/os-specific/solaris/installer-exclude/jmf.jar"/>
+	<classpathentry kind="lib" path="lib/os-specific/solaris/jdic_stub.jar"/>
+	<classpathentry kind="lib" path="lib/os-specific/windows/installer-exclude/jmf.jar"/>
+	<classpathentry kind="lib" path="lib/os-specific/windows/installer-exclude/jna-platform-win32.jar"/>
+	<classpathentry kind="lib" path="lib/os-specific/windows/installer-exclude/sound.jar"/>
+	<classpathentry kind="lib" path="lib/os-specific/windows/jdic_stub.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/lcrypto-jdk16-143.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/otr4j.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/jmyspell-core.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/jnsapi.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/mac_widgets-0.9.5.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/forms-1.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/google-collect-1.0-rc1.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/gdata-client-1.0.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/gdata-client-meta-1.0.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/gdata-contacts-3.0.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/gdata-contacts-meta-3.0.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/gdata-core-1.0.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/hexdump-0.2.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/libdbus-java-2.7.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/unix-0.5.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/sdes4j.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/dnsjava.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="http://www.dnsjava.org/dnsjava-current/doc/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/installer-exclude/httpmime-4.1.2.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/httpcore-4.1.2.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/httpclient-4.1.2.jar"/>
+	<classpathentry kind="output" path="classes"/>
+</classpath>
diff --git a/ide/eclipse/.project b/.project
similarity index 100%
rename from ide/eclipse/.project
rename to .project
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..c5a6ec2f1
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,282 @@
+#Tue Nov 29 14:51:57 CET 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=48
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=16
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=48
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=33
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=32
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=33
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=49
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=48
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/ide/eclipse/.classpath b/ide/eclipse/.classpath
deleted file mode 100644
index 894de1c58..000000000
--- a/ide/eclipse/.classpath
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="test"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="lib" path="lib/felix.jar"/>
-    <classpathentry kind="lib" path="lib/jdic-all.jar"/>
-    <classpathentry kind="lib" path="lib/bundle/junit.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/apache-ant-1.7.0.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/aclibico-2.1.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/commons-logging-1.1.1.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/concurrent.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/dict4j.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/dhcp4java-1.00.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/jmdns.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/dnsjava.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/fmj.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/httpclient-4.1.2.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/httpcore-4.1.2.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/httpmime-4.1.2.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/jain-sip-api.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/jain-sip-ri.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/jcalendar-1.3.2.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/jdic_misc.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/jdom.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/jfontchooser-1.0.5.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/jmf.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/jml-1.0b5.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/jna.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/joscar-client.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/joscar-common.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/joscar-protocol.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/jsch-0.1.36.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/jsocks-klea.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/json-20090723.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/jspeex.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/junit.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/laf-widget.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/libphonenumber-2.4.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/log4j-1.2.8.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/lti-civil-no_s_w_t.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/jain-sdp.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/pircbot.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/profiler4j-1.0-beta3-SC.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/rome-0.9.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/smack.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/smackx.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/ice4j.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/swing-worker-1.2.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/transparency.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/ymsg_network_v0_67.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/zrtp4j-light.jar"/>
-    <classpathentry kind="lib" path="lib/os-specific/linux/installer-exclude/jmf.jar"/>
-    <classpathentry kind="lib" path="lib/os-specific/linux/jdic_stub.jar"/>
-    <classpathentry kind="lib" path="lib/os-specific/mac/installer-exclude/jmf.jar"/>
-    <classpathentry kind="lib" path="lib/os-specific/mac/OrangeExtensions.jar"/>
-    <classpathentry kind="lib" path="lib/os-specific/mac/growl4j.jar"/>
-    <classpathentry kind="lib" path="lib/os-specific/mac/jdic_stub.jar"/>
-    <classpathentry kind="lib" path="lib/os-specific/solaris/installer-exclude/jmf.jar"/>
-    <classpathentry kind="lib" path="lib/os-specific/solaris/jdic_stub.jar"/>
-    <classpathentry kind="lib" path="lib/os-specific/windows/installer-exclude/jmf.jar"/>
-    <classpathentry kind="lib" path="lib/os-specific/windows/installer-exclude/jna-platform-win32.jar"/>
-    <classpathentry kind="lib" path="lib/os-specific/windows/installer-exclude/sound.jar"/>
-    <classpathentry kind="lib" path="lib/os-specific/windows/jdic_stub.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/lcrypto-jdk16-143.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/otr4j.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/jmyspell-core.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/jnsapi.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/mac_widgets-0.9.5.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/forms-1.2.1.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/google-collect-1.0-rc1.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/gdata-client-1.0.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/gdata-client-meta-1.0.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/gdata-contacts-3.0.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/gdata-contacts-meta-3.0.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/gdata-core-1.0.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/libdbus-java-2.7.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/hexdump-0.2.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/unix-0.5.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/sdes4j.jar"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/ide/eclipse/README b/ide/eclipse/README
deleted file mode 100644
index a1c271a78..000000000
--- a/ide/eclipse/README
+++ /dev/null
@@ -1,14 +0,0 @@
-Those are the project files for Eclipse IDE.
-
-In order to use it do:
-
-1) Close Eclipse
-2) Copy .project and .classpath to the directory of your project
-	a) Under linux:
-		cp .project ../../
-		cp .classpath ../../
-
-	b) Under Windows:
-		copy .project ..\..\
-		copy .classpath ..\..\
-3) Start Eclipse
diff --git a/ide/nbproject/ide-file-targets.xml b/nbproject/ide-file-targets.xml
similarity index 95%
rename from ide/nbproject/ide-file-targets.xml
rename to nbproject/ide-file-targets.xml
index 63b2fe9b4..7f325d2a6 100644
--- a/ide/nbproject/ide-file-targets.xml
+++ b/nbproject/ide-file-targets.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created by Brian Burch on October 8, 2008
-     Netbeans debug targets are now held in this file. You should copy it to 
-     ./nbproject/ide-file-targets.xml (when NetBeans is not running!)
-     to make it active on your own system.
+     Netbeans debug targets are now held in this file.
     -->
 <project basedir=".." name="SIP Communicator-IDE">
 
diff --git a/ide/nbproject/ide-targets.xml b/nbproject/ide-targets.xml
similarity index 94%
rename from ide/nbproject/ide-targets.xml
rename to nbproject/ide-targets.xml
index b8f037779..fa4778269 100644
--- a/ide/nbproject/ide-targets.xml
+++ b/nbproject/ide-targets.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created by Brian Burch on August 25, 2005
-     Netbeans debug targets are now held in this file. You should copy it to 
-     ./nbproject/ide-targets.xml (when NetBeans is not running!)
-     to make it active on your own system.
+     Netbeans debug targets are now held in this file.
     -->
 <project basedir=".." name="SIP Communicator-IDE">
 
diff --git a/ide/nbproject/project.xml b/nbproject/project.xml
similarity index 94%
rename from ide/nbproject/project.xml
rename to nbproject/project.xml
index 438571f8b..19c926ecd 100644
--- a/ide/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -4,15 +4,9 @@
     <configuration>
         <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
             <!-- Created by Brian Burch on September 27, 2006
-                 The master version is held in the sandbox, as 
-                 ./ide/nbproject/project.xml. You should copy it to 
-                 ./nbproject/project.xml (when NetBeans is not running!)
-                 to make it active on your own system.
               ** Updated by Brian Burch on October 22, 2008
                  Netbeans debug targets are now held in 
-                 ./ide/nbproject/ide-targets.xml and ./ide/nbproject/ide-file-targets.xml.
-                 You should copy these two files to ./nbproject/ (when NetBeans is not    
-                 running!) to make them active on your own system.
+                 ./nbproject/ide-targets.xml and ./nbproject/ide-file-targets.xml.
                  -->
             <name>jitsi</name>
             <properties/>