diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 6a9246b..0000000
--- a/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/pedals/is/floatingjapanesedictionary/deinflector/DeInflector.java=UTF-8
-encoding//src/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionaryOpenHelper.java=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ed6772c..0000000
--- a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,284 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6
-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=16
-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=0
-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=0
-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=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-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=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
-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=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_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=false
-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=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=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-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=true
-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=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=false
-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=1
-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=tab
-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/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 821e5ab..0000000
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-formatter_profile=_Custom Java
-formatter_settings_version=12
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..833eee9
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,15 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.1.0'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
diff --git a/etc/sql.txt b/etc/sql.txt
new file mode 100644
index 0000000..244aab7
--- /dev/null
+++ b/etc/sql.txt
@@ -0,0 +1,101 @@
+CREATE TABLE dict (kanji TEXT, kana TEXT, entry TEXT);
+INSERT INTO table VALUES('軍車','ぐんしゃ','(n) tank (military vehicle)');
+INSERT INTO table VALUES('他州','たしゅう','(n) another state/different region');
+INSERT INTO table VALUES('押しこむ','おしこむ','(v5m,vi,vt) to push into/to cram into/to stuff into/to crowd into/to break in/to burglarize');
+INSERT INTO table VALUES('米話','べいわ','(n) American spoken English');
+INSERT INTO table VALUES(NULL,'どーなつ','ドーナツ /(n) doughnut/(P)/');
+INSERT INTO table VALUES('大宮司','だいぐうじ','(n) high priest of a great shrine');
+INSERT INTO table VALUES('成書','せいしょ','(n) book');
+INSERT INTO table VALUES('ちきん南蛮','ちきんなんばん','チキン南蛮 [チキンなんばん] /(n) fried chicken with vinegar and tartar sauce/');
+INSERT INTO table VALUES('一定不変','いっていふへん','(n) invariable/permanent');
+INSERT INTO table VALUES('つむじ風','つむじかぜ','(n) whirlwind');
+INSERT INTO table VALUES('躁病','そうびょう','(n,adj-no) mania');
+INSERT INTO table VALUES(NULL,'おーしゃのーと','オーシャノート /(n) oceanaut/');
+INSERT INTO table VALUES(NULL,'ちゃんばら','(n,abbr) sword fight/sword play');
+INSERT INTO table VALUES(NULL,'たいむれこーだー','タイムレコーダー /(n) time clock/time recorder/');
+INSERT INTO table VALUES(NULL,'めがねべにはぜ','メガネベニハゼ /(n) redface dwarfgoby (Trimma benjamini, species found in the Western Pacific)/ring-eye pygmy-goby/');
+INSERT INTO table VALUES('炊立て','たきたて','(adj-no) freshly cooked');
+INSERT INTO table VALUES('食い掛け','くいかけ','(adj-no) half-eaten');
+INSERT INTO table VALUES('溢れる','こぼれる','(v1,vi,uk) to spill/to fall out of/to overflow/to peek through/to become visible (although normally not)/to escape (of a smile, tear, etc.)/(P)');
+INSERT INTO table VALUES('梯子の段','はしごのだん','(n) rung of a ladder');
+INSERT INTO table VALUES('相好','そうごう','(n) features/appearance');
+INSERT INTO table VALUES('閉会のことば','へいかいのことば','(exp) closing address');
+INSERT INTO table VALUES('不明','ふめい','(adj-na,n) unknown/obscure/indistinct/uncertain/ambiguous/ignorant/lack of wisdom/anonymous/unidentified/(P)');
+INSERT INTO table VALUES('謝謝','しえしえ','謝謝 [シエシエ] /(int) thank you/');
+INSERT INTO table VALUES('丸写し','まるうつし','(n,vs) copying in entirety (verbatim)');
+INSERT INTO table VALUES('下足場','げそくば','(n) area for storing (outdoor) footwear');
+INSERT INTO table VALUES(NULL,'こんしゃすねす','コンシャスネス /(n) consciousness/');
+INSERT INTO table VALUES('一転','いってん','(n-adv) turn/complete change');
+INSERT INTO table VALUES('言い返し','いいかえし','(n) replying/reply');
+INSERT INTO table VALUES('一人天下','ひとりてんか','(n) being the sole master of the situation/reigning supreme/standing unchallenged');
+INSERT INTO table VALUES(NULL,'もざんびーく','モザンビーク /(n) Mozambique/(P)/');
+INSERT INTO table VALUES('多様性','たようせい','(n) diversity/variety');
+INSERT INTO table VALUES('路用','ろよう','(n) travelling expenses/traveling expenses');
+INSERT INTO table VALUES('序詞','じょし','(n) foreword/preface/introduction/prefatory modifying statement (of a waka, etc.)');
+INSERT INTO table VALUES('かみ合せ','かみあわせ','(n) engaging or meshing (of gears)/occlusion (of teeth)');
+INSERT INTO table VALUES('雷名','らいめい','(n) fame/renown/great name');
+INSERT INTO table VALUES(NULL,'べるがもっと','ベルガモット /(n) bergamot (Citrus aurantium ssp. bergamia)/bergamot orange/bergamot (Monarda didyma)/bee balm/Oswego tea/');
+INSERT INTO table VALUES('鈎','はり','(n,ctr,n-suf) needle/pin/hook/stinger/thorn/hand (e.g. clock, etc.)/pointer/staple (for a stapler)/needlework/sewing/malice/counter for stitches/(P)');
+INSERT INTO table VALUES('詰物','つめもの','(n) filling or packing material/stuffing/padding');
+INSERT INTO table VALUES('気宇仙','きゅうせん','(n,uk) multicolorfin rainbowfish (Parajulis poecilepterus, was Halichoeres poecilopterus)');
+INSERT INTO table VALUES('火山灰','かざんばい','(n) volcanic ash');
+INSERT INTO table VALUES('鱝','えい','(n,uk,gikun,oK) ray (fish)/stingray');
+INSERT INTO table VALUES('引き据える','ひきすえる','(v1) to (physically) force someone to sit down');
+INSERT INTO table VALUES(NULL,'ぐりーくらぶ','グリークラブ /(n) glee club/(P)/');
+INSERT INTO table VALUES('捏ねくり回す','こねくりまわす','(v5s) to knead/to turn');
+INSERT INTO table VALUES('踞る','うずくまる','(v5r,vi,uk) to crouch/to squat/to cower/(P)');
+INSERT INTO table VALUES('嘴太海烏','はしぶとうみがらす','(n,uk) thick-billed murre (Uria lomvia)/Brunnich''s guillemot');
+INSERT INTO table VALUES('可変数','かへんすう','(n) variable number');
+INSERT INTO table VALUES(NULL,'ないとがうん','ナイトガウン /(n) nightgown/');
+INSERT INTO table VALUES('結婚祝い','けっこんいわい','(n) wedding present');
+INSERT INTO table VALUES('秋風落莫','しゅうふうらくばく','(n) forlorn and helpless/lonely and desolate');
+INSERT INTO table VALUES('群衆','ぐんじゅ','(n,vs) group (of people)/crowd/horde/throng/mob/multitude/(P)');
+INSERT INTO table VALUES('天津','あまつ','(adj-f,arch) heavenly/imperial');
+INSERT INTO table VALUES('老優','ろうゆう','(n) elderly or veteran actor');
+INSERT INTO table VALUES('動物ういるす','どうぶつういるす','動物ウイルス [どうぶつウイルス] /(n) animal virus/');
+INSERT INTO table VALUES('竈','かま','(n) stove/furnace/kiln');
+INSERT INTO table VALUES('似鯉','にごい','似鯉 [ニゴイ] /(n,uk) Hemibarbus barbus (species of cyprinid)/');
+INSERT INTO table VALUES(NULL,'おーあーるでーびー','オーアールデービー /(n) ORDB/');
+INSERT INTO table VALUES('銀鍍金','ぎんめっき','(n,vs,adj-no) silvering/silver-plating');
+INSERT INTO table VALUES('行燈','あんどう','(n,oK) fixed paper-enclosed lantern/paper-covered wooden stand housing an (oil) lamp');
+INSERT INTO table VALUES('竜の落し子','たつのおとしご','竜の落し子 [タツノオトシゴ] /(n) seahorse/sea horse/');
+INSERT INTO table VALUES('体位','たいい','(n,adj-no) physique/physical standard/posture/sexual position');
+INSERT INTO table VALUES('執','たらし','(n,arch) bow (and arrow; esp. of a noble)');
+INSERT INTO table VALUES('桂男','かつらお','(n,arch) man in the moon');
+INSERT INTO table VALUES('申込書','もうしこみしょ','(n) application form/written application/(P)');
+INSERT INTO table VALUES('食事をとる','しょくじをとる','(exp,v5r) to take a meal/to have a meal/to catch a meal/to get grub/to grub/to break bread/to chow down/to eat dinner/to have a bite/to strap on a feed-bag');
+INSERT INTO table VALUES(NULL,'らいぶらりけーす','ライブラリケース /(n) library case/');
+INSERT INTO table VALUES(NULL,'さんどばす','サンドバス /(n) sand bath/');
+INSERT INTO table VALUES('値段を高く付ける','ねだんをたかくつける','(exp,v1) to put a high price on');
+INSERT INTO table VALUES('書き難い','かきにくい','(adj-i) difficult to write or draw/does not write well (pen, brush, etc.)');
+INSERT INTO table VALUES(NULL,'えらーこーど','エラーコード /(n) error code/');
+INSERT INTO table VALUES('銘文','めいぶん','(n) inscription');
+INSERT INTO table VALUES('光学','こうがく','(n,adj-no) optics');
+INSERT INTO table VALUES('くーろんの法則','くーろんのほうそく','クーロンの法則 [クーロンのほうそく] /(n) Coulomb''s law/');
+INSERT INTO table VALUES('癒し','いやし','(n,adj-no) healing/soothing/therapy/comfort/solace');
+INSERT INTO table VALUES('先込め銃','さきごめじゅう','(n) muzzle loader');
+INSERT INTO table VALUES('軍備縮小','ぐんびしゅくしょう','(n) reduction of armaments/disarmament');
+INSERT INTO table VALUES('配電','はいでん','(n,vs) distribution of electricity');
+INSERT INTO table VALUES('悪手','あくしゅ','(n) poor move');
+INSERT INTO table VALUES('外股','そともも','(n) outer thigh');
+INSERT INTO table VALUES('汚染','おせん','(n,vs) pollution/contamination/(P)');
+INSERT INTO table VALUES('憧憬','しょうけい','(n,vs) longing/aspiration');
+INSERT INTO table VALUES('輔星','ほせい','(n,obsc) Alcor/the Little Horseman star');
+INSERT INTO table VALUES('食器洗い機','しょっきあらいき','(n) dishwasher/dishwashing machine');
+INSERT INTO table VALUES('耳が痛い','みみがいたい','(exp,adj-i) (e.g. of a reprimand) being painfully-true/striking home');
+INSERT INTO table VALUES('肝臓茸','かんぞうたけ','(n,uk) beefsteak fungus (Fistulina hepatica)/beefsteak mushroom');
+INSERT INTO table VALUES(NULL,'ふらっとぱねる','フラットパネル /(n) flat panel (monitor, e.g.)/');
+INSERT INTO table VALUES(NULL,'すたんだーどらいぶらり','スタンダードライブラリ /(n) standard library (programming)/');
+INSERT INTO table VALUES('許すまじ','ゆるすまじ','(exp) to be unforgivable/to never forgive something');
+INSERT INTO table VALUES('南方仏教','なんぽうぶっきょう','(n) Southern Buddhism (as practiced in Sri Lanka and Southeast Asia)');
+INSERT INTO table VALUES('南海偽角平虫','なんかいにせつのひらむし','南海偽角平虫 [ナンカイニセツノヒラムシ] /(n,uk) Persian carpet flatworm (Pseudobiceros bedfordi)/Bedford''s flatworm/');
+INSERT INTO table VALUES(NULL,'べんちぷれす','ベンチプレス /(n) bench press/');
+INSERT INTO table VALUES('外国人持ち株比率','がいこくじんもちかぶひりつ','(n) foreign stock ownership ratio/foreign stockholding ratio');
+INSERT INTO table VALUES('身元調査','みもとちょうさ','(n,col) identity or background check (often to see if someone is a burakumin)');
+INSERT INTO table VALUES(NULL,'おんざまーく','オンザマーク /(n) on the mark/');
+INSERT INTO table VALUES('原子力時代','げんしりょくじだい','(n) atomic age');
+INSERT INTO table VALUES(NULL,'そんな','(adj-pn) such (about the actions of the listener, or about ideas expressed or understood by the listener)/like that/that sort of/(P)');
+INSERT INTO table VALUES('恬','てん','(adj-t,adv-to) nonchalant');
+INSERT INTO table VALUES(NULL,'そーだふろーと','ソーダフロート /(n) soda float/');
+INSERT INTO table VALUES('保守ぱねる','ほしゅぱねる','保守パネル [ほしゅパネル] /(n) maintenance panel/');
+INSERT INTO table VALUES('帯電体','たいでんたい','(n) charged body');
diff --git a/floatingJapaneseDictionary/build.gradle b/floatingJapaneseDictionary/build.gradle
new file mode 100644
index 0000000..1780ab7
--- /dev/null
+++ b/floatingJapaneseDictionary/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "21.1.2"
+
+    defaultConfig {
+        applicationId "pedals.is.floatingjapanesedictionary"
+        minSdkVersion 11
+        targetSdkVersion 21
+
+        testApplicationId "pedals.is.floatingjapanesedictionary.test"
+        testInstrumentationRunner "android.test.InstrumentationTestRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
+
+dependencies {
+    compile 'com.github.sherpya:standout:1.0.2'
+    compile 'com.android.support:support-v4:21.0.0'
+}
diff --git a/floatingJapaneseDictionary/src/androidTest/java/pedals/is/floatingjapanesedictionary/test/DeinflectorTest.java b/floatingJapaneseDictionary/src/androidTest/java/pedals/is/floatingjapanesedictionary/test/DeinflectorTest.java
new file mode 100644
index 0000000..d5f7376
--- /dev/null
+++ b/floatingJapaneseDictionary/src/androidTest/java/pedals/is/floatingjapanesedictionary/test/DeinflectorTest.java
@@ -0,0 +1,43 @@
+package pedals.is.floatingjapanesedictionary.test;
+
+import java.util.ArrayList;
+
+import pedals.is.floatingjapanesedictionary.deinflector.DeInflector;
+import pedals.is.floatingjapanesedictionary.deinflector.DeinflectorTerm;
+import junit.framework.TestCase;
+
+public class DeinflectorTest extends TestCase {
+
+
+	/**
+	 * @param name
+	 */
+	public DeinflectorTest(String name) {
+		super(name);
+	}
+	
+	/* (non-Javadoc)
+	 * @see junit.framework.TestCase#setUp()
+	 */
+	protected void setUp() throws Exception {
+	    super.setUp();
+	 }
+
+	/* (non-Javadoc)
+	 * @see junit.framework.TestCase#tearDown()
+	 */
+	protected void tearDown() throws Exception {
+	    super.tearDown();
+	}
+
+	/**
+	 * Test something
+	 */
+	public final void testDeinflect() {
+		ArrayList<DeinflectorTerm> words = DeInflector.deInflect("来ます");        
+		assertTrue("Kanji deinflected", words.get(0).word.equals("来る"));
+		words = DeInflector.deInflect("きます");
+		assertTrue("Hiragana deinflected", words.get(0).word.equals("くる"));
+	}
+
+}
diff --git a/floatingJapaneseDictionary/src/androidTest/java/pedals/is/floatingjapanesedictionary/test/DictionaryManagerServiceTest.java b/floatingJapaneseDictionary/src/androidTest/java/pedals/is/floatingjapanesedictionary/test/DictionaryManagerServiceTest.java
new file mode 100644
index 0000000..ec9dea6
--- /dev/null
+++ b/floatingJapaneseDictionary/src/androidTest/java/pedals/is/floatingjapanesedictionary/test/DictionaryManagerServiceTest.java
@@ -0,0 +1,41 @@
+package pedals.is.floatingjapanesedictionary.test;
+
+import pedals.is.floatingjapanesedictionary.downloader.DictionaryManagerService;
+import android.content.Intent;
+import android.test.ServiceTestCase;
+
+public class DictionaryManagerServiceTest extends
+		ServiceTestCase<DictionaryManagerService> {
+
+	public DictionaryManagerServiceTest() {
+		super(DictionaryManagerService.class);
+	}
+
+	public final void testStarts() {
+		startService(new Intent(getContext(), DictionaryManagerService.class));
+		try {
+			Thread.sleep(2000);
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+		assertFalse("DictionaryManagerService stops when given no action",
+				DictionaryManagerService.RUNNING);
+
+	}
+
+	public final void testDeletingNothing() {
+		Intent intent = new Intent(getContext(), DictionaryManagerService.class);
+		intent.putExtra("action", "reset");
+		startService(intent);
+		try {
+			Thread.sleep(2000);
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+		assertFalse(
+				"DictionaryManagerService stops when told to reset and there are no files",
+				DictionaryManagerService.RUNNING);
+
+	}
+
+}
diff --git a/floatingJapaneseDictionary/src/androidTest/java/pedals/is/floatingjapanesedictionary/test/DictionaryOpenHelperTest.java b/floatingJapaneseDictionary/src/androidTest/java/pedals/is/floatingjapanesedictionary/test/DictionaryOpenHelperTest.java
new file mode 100644
index 0000000..b542b80
--- /dev/null
+++ b/floatingJapaneseDictionary/src/androidTest/java/pedals/is/floatingjapanesedictionary/test/DictionaryOpenHelperTest.java
@@ -0,0 +1,101 @@
+package pedals.is.floatingjapanesedictionary.test;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.DatabaseUtils;
+import android.database.sqlite.SQLiteDatabase;
+import android.test.AndroidTestCase;
+import pedals.is.floatingjapanesedictionary.dictionarysearcher.DictionaryOpenHelper;
+
+public class DictionaryOpenHelperTest extends AndroidTestCase {
+
+	public DictionaryOpenHelperTest() {
+		super();
+	}
+
+	public final void testRawQuery() {
+		DictionaryOpenHelper dictOpener = new DictionaryOpenHelper(getContext());
+		SQLiteDatabase dictionary = dictOpener.getReadableDatabase();
+		Cursor c = dictionary.rawQuery(
+				"select distinct kanji, kana, entry from dict", null);
+		assertTrue("Raw query fetched one row", c.moveToNext());
+		// fail(DatabaseUtils.dumpCurrentRowToString(c));
+	}
+
+	public final void testKanjiQuery() {
+		DictionaryOpenHelper dictOpener = new DictionaryOpenHelper(getContext());
+		SQLiteDatabase dictionary = dictOpener.getReadableDatabase();
+		Cursor c = dictionary.rawQuery(
+				"select distinct kanji, kana, entry from dict where kanji=?",
+				new String[] { "軍車" });
+		c.moveToNext();
+		ContentValues values = new ContentValues();
+		DatabaseUtils.cursorRowToContentValues(c, values);
+		assertTrue(values.getAsString("kanji").equals("軍車"));
+	}
+
+	public final void testKanaWithKanjiQuery() {
+		DictionaryOpenHelper dictOpener = new DictionaryOpenHelper(getContext());
+		SQLiteDatabase dictionary = dictOpener.getReadableDatabase();
+		Cursor c = dictionary.rawQuery(
+				"select distinct kanji, kana, entry from dict where kana=?",
+				new String[] { "ぐんしゃ" });
+		c.moveToNext();
+		ContentValues values = new ContentValues();
+		DatabaseUtils.cursorRowToContentValues(c, values);
+		assertTrue(values.getAsString("kana").equals("ぐんしゃ"));
+	}
+
+	public final void testOrQuerywithKanjiOnly() {
+		DictionaryOpenHelper dictOpener = new DictionaryOpenHelper(getContext());
+		SQLiteDatabase dictionary = dictOpener.getReadableDatabase();
+		Cursor c = dictionary
+				.rawQuery(
+						"select distinct kanji, kana, entry from dict where kanji=? or kana=?",
+						new String[] { "軍車", "軍車" });
+		c.moveToNext();
+		ContentValues values = new ContentValues();
+		DatabaseUtils.cursorRowToContentValues(c, values);
+		assertTrue(values.getAsString("kanji").equals("軍車"));
+	}
+
+	public final void testOrQuerywithKanaOnly() {
+		DictionaryOpenHelper dictOpener = new DictionaryOpenHelper(getContext());
+		SQLiteDatabase dictionary = dictOpener.getReadableDatabase();
+		Cursor c = dictionary
+				.rawQuery(
+						"select distinct kanji, kana, entry from dict where kanji=? or kana=?",
+						new String[] { "ぐんしゃ", "ぐんしゃ" });
+		c.moveToNext();
+		ContentValues values = new ContentValues();
+		DatabaseUtils.cursorRowToContentValues(c, values);
+		assertTrue(values.getAsString("kana").equals("ぐんしゃ"));
+	}
+
+	public final void testQuerywithBothKanjiandKana() {
+		DictionaryOpenHelper dictOpener = new DictionaryOpenHelper(getContext());
+		SQLiteDatabase dictionary = dictOpener.getReadableDatabase();
+		Cursor c = dictionary
+				.rawQuery(
+						"select distinct kanji, kana, entry from dict where kanji=? or kana=?",
+						new String[] { "軍車", "ぐんしゃ" });
+		c.moveToNext();
+		ContentValues values = new ContentValues();
+		DatabaseUtils.cursorRowToContentValues(c, values);
+		assertTrue(values.getAsString("kanji").equals("軍車"));
+		assertTrue(values.getAsString("kana").equals("ぐんしゃ"));
+	}
+
+	public final void testKanaOnlyQuery() {
+		DictionaryOpenHelper dictOpener = new DictionaryOpenHelper(getContext());
+		SQLiteDatabase dictionary = dictOpener.getReadableDatabase();
+		Cursor c = dictionary.rawQuery(
+				"select distinct kanji, kana, entry from dict where kana=?",
+				new String[] { "どーなつ" });
+		c.moveToNext();
+		ContentValues values = new ContentValues();
+		DatabaseUtils.cursorRowToContentValues(c, values);
+		assertTrue(values.getAsString("kana").equals("どーなつ"));
+	}
+
+}
diff --git a/floatingJapaneseDictionary/src/androidTest/java/pedals/is/floatingjapanesedictionary/test/DictionarySearcherTest.java b/floatingJapaneseDictionary/src/androidTest/java/pedals/is/floatingjapanesedictionary/test/DictionarySearcherTest.java
new file mode 100644
index 0000000..f2b1dbb
--- /dev/null
+++ b/floatingJapaneseDictionary/src/androidTest/java/pedals/is/floatingjapanesedictionary/test/DictionarySearcherTest.java
@@ -0,0 +1,89 @@
+package pedals.is.floatingjapanesedictionary.test;
+
+import pedals.is.floatingjapanesedictionary.dictionarysearcher.DictionaryEntries;
+import pedals.is.floatingjapanesedictionary.dictionarysearcher.DictionaryEntry;
+import pedals.is.floatingjapanesedictionary.dictionarysearcher.DictionarySearcher;
+import android.test.AndroidTestCase;
+
+public class DictionarySearcherTest extends AndroidTestCase {
+
+	public DictionarySearcherTest() {
+		super();
+	}
+	
+	public final void testFindKanjiWord() {
+		DictionaryEntries entries = DictionarySearcher.findWord(getContext(), "軍車");
+		assertFalse(entries.isEmpty());
+		DictionaryEntry entry = entries.get(0);
+		assertTrue(entry.toString().startsWith("軍車"));
+		assertTrue(entry.toString().contains("ぐんしゃ"));
+	}
+	
+	public final void testFindKanjiWordwithKana() {
+		DictionaryEntries entries = DictionarySearcher.findWord(getContext(), "ぐんしゃ");
+		assertFalse(entries.isEmpty());
+		DictionaryEntry entry = entries.get(0);
+		assertTrue(entry.toString().startsWith("軍車"));
+		assertTrue(entry.toString().contains("ぐんしゃ"));
+	}
+	
+	public final void testFindHiraganaWord() {
+		DictionaryEntries entries = DictionarySearcher.findWord(getContext(), "ちゃんばら");
+		assertFalse(entries.isEmpty());
+		DictionaryEntry entry = entries.get(0);
+		assertTrue(entry.toString().startsWith("ちゃんばら"));
+	}
+	
+	public final void testkatakanaToHiragana() {
+		assertTrue(DictionarySearcher.katakanaToHiragana("ナツ").equals("なつ"));
+	}
+	
+	public final void testkatakanaToHiraganaWithLongVowel() {
+		assertTrue(DictionarySearcher.katakanaToHiragana("ドーナツ").equals("どーなつ"));
+	}
+	
+	public final void testkatakanaToHiraganaWithNoKatakkana() {
+		assertTrue(DictionarySearcher.katakanaToHiragana("軍車").equals("軍車"));
+		assertTrue(DictionarySearcher.katakanaToHiragana("ぐんしゃ").equals("ぐんしゃ"));
+		assertTrue(DictionarySearcher.katakanaToHiragana("ぐんしゃー").equals("ぐんしゃー"));
+	}
+	
+	public final void testFindKatakanaWord() {
+		DictionaryEntries entries = DictionarySearcher.findWord(getContext(), "ドーナツ");
+		assertFalse(entries.isEmpty());
+		DictionaryEntry entry = entries.get(0);
+		assertTrue(entry.toString().contains("ドーナツ"));
+	}
+	
+	public final void testFindKanjiInflectedWord() {
+		DictionaryEntries entries = DictionarySearcher.findWord(getContext(), "踞った");
+		assertFalse(entries.isEmpty());
+		DictionaryEntry entry = entries.get(0);
+		assertTrue(entry.toString().startsWith("踞る"));
+		assertTrue(entry.toString().contains("(past)"));
+	}
+	
+	public final void testFindKanaInflectedWord() {
+		DictionaryEntries entries = DictionarySearcher.findWord(getContext(), "うずくまった");
+		assertFalse(entries.isEmpty());
+		DictionaryEntry entry = entries.get(0);
+		assertTrue(entry.toString().startsWith("踞る"));
+		assertTrue(entry.toString().contains("(past)"));
+	}
+	
+	public final void testFindWordwithTrailingCharacters() {
+		DictionaryEntries entries = DictionarySearcher.findWord(getContext(), "踞るドーナツ");
+		assertFalse(entries.isEmpty());
+		DictionaryEntry entry = entries.get(0);
+		assertTrue(entry.toString().startsWith("踞る"));
+	}
+	
+	public final void testIsHiragna() {
+			assertTrue(DictionarySearcher.isHiragana("ぐんしゃ"));
+			assertTrue(DictionarySearcher.isHiragana("ぐんしゃー"));
+			assertTrue(DictionarySearcher.isHiragana("うずくまった"));
+			assertFalse(DictionarySearcher.isHiragana("踞る"));
+			assertFalse(DictionarySearcher.isHiragana("ドーナツ"));
+	}
+
+}
diff --git a/res/drawable-hdpi/ic_launcher.png b/floatingJapaneseDictionary/src/androidTest/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from res/drawable-hdpi/ic_launcher.png
rename to floatingJapaneseDictionary/src/androidTest/res/drawable-hdpi/ic_launcher.png
diff --git a/floatingJapaneseDictionary/src/androidTest/res/drawable-ldpi/ic_launcher.png b/floatingJapaneseDictionary/src/androidTest/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000..9923872
Binary files /dev/null and b/floatingJapaneseDictionary/src/androidTest/res/drawable-ldpi/ic_launcher.png differ
diff --git a/res/drawable-mdpi/ic_launcher.png b/floatingJapaneseDictionary/src/androidTest/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from res/drawable-mdpi/ic_launcher.png
rename to floatingJapaneseDictionary/src/androidTest/res/drawable-mdpi/ic_launcher.png
diff --git a/res/drawable-xhdpi/ic_launcher.png b/floatingJapaneseDictionary/src/androidTest/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from res/drawable-xhdpi/ic_launcher.png
rename to floatingJapaneseDictionary/src/androidTest/res/drawable-xhdpi/ic_launcher.png
diff --git a/floatingJapaneseDictionary/src/androidTest/res/values/strings.xml b/floatingJapaneseDictionary/src/androidTest/res/values/strings.xml
new file mode 100644
index 0000000..0874d81
--- /dev/null
+++ b/floatingJapaneseDictionary/src/androidTest/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">FloatingJapaneseDictionaryTestTest</string>
+
+</resources>
diff --git a/AndroidManifest.xml b/floatingJapaneseDictionary/src/main/AndroidManifest.xml
similarity index 97%
rename from AndroidManifest.xml
rename to floatingJapaneseDictionary/src/main/AndroidManifest.xml
index 778405f..d06bdf5 100644
--- a/AndroidManifest.xml
+++ b/floatingJapaneseDictionary/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="pedals.is.floatingjapanesedictionary" android:versionCode="2"
 	android:versionName="2.0">
diff --git a/assets/license.html b/floatingJapaneseDictionary/src/main/assets/license.html
similarity index 100%
rename from assets/license.html
rename to floatingJapaneseDictionary/src/main/assets/license.html
diff --git a/src/pedals/is/floatingjapanesedictionary/AboutActivity.java b/floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/AboutActivity.java
similarity index 100%
rename from src/pedals/is/floatingjapanesedictionary/AboutActivity.java
rename to floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/AboutActivity.java
diff --git a/src/pedals/is/floatingjapanesedictionary/FloatingJapaneseDictionaryLauncherActivity.java b/floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/FloatingJapaneseDictionaryLauncherActivity.java
similarity index 100%
rename from src/pedals/is/floatingjapanesedictionary/FloatingJapaneseDictionaryLauncherActivity.java
rename to floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/FloatingJapaneseDictionaryLauncherActivity.java
diff --git a/src/pedals/is/floatingjapanesedictionary/FloatingJapaneseDictionaryService.java b/floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/FloatingJapaneseDictionaryService.java
similarity index 100%
rename from src/pedals/is/floatingjapanesedictionary/FloatingJapaneseDictionaryService.java
rename to floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/FloatingJapaneseDictionaryService.java
diff --git a/src/pedals/is/floatingjapanesedictionary/deinflector/DeInflector.java b/floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/deinflector/DeInflector.java
similarity index 100%
rename from src/pedals/is/floatingjapanesedictionary/deinflector/DeInflector.java
rename to floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/deinflector/DeInflector.java
diff --git a/src/pedals/is/floatingjapanesedictionary/deinflector/DeInflectorRuleEntry.java b/floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/deinflector/DeInflectorRuleEntry.java
similarity index 100%
rename from src/pedals/is/floatingjapanesedictionary/deinflector/DeInflectorRuleEntry.java
rename to floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/deinflector/DeInflectorRuleEntry.java
diff --git a/src/pedals/is/floatingjapanesedictionary/deinflector/DeInflectorRuleGroup.java b/floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/deinflector/DeInflectorRuleGroup.java
similarity index 100%
rename from src/pedals/is/floatingjapanesedictionary/deinflector/DeInflectorRuleGroup.java
rename to floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/deinflector/DeInflectorRuleGroup.java
diff --git a/src/pedals/is/floatingjapanesedictionary/deinflector/DeinflectorTerm.java b/floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/deinflector/DeinflectorTerm.java
similarity index 100%
rename from src/pedals/is/floatingjapanesedictionary/deinflector/DeinflectorTerm.java
rename to floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/deinflector/DeinflectorTerm.java
diff --git a/src/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionaryEntries.java b/floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionaryEntries.java
similarity index 100%
rename from src/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionaryEntries.java
rename to floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionaryEntries.java
diff --git a/src/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionaryEntry.java b/floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionaryEntry.java
similarity index 100%
rename from src/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionaryEntry.java
rename to floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionaryEntry.java
diff --git a/src/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionaryOpenHelper.java b/floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionaryOpenHelper.java
similarity index 100%
rename from src/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionaryOpenHelper.java
rename to floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionaryOpenHelper.java
diff --git a/src/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionarySearcher.java b/floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionarySearcher.java
similarity index 100%
rename from src/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionarySearcher.java
rename to floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionarySearcher.java
diff --git a/src/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionarySearcherActivity.java b/floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionarySearcherActivity.java
similarity index 100%
rename from src/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionarySearcherActivity.java
rename to floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/dictionarysearcher/DictionarySearcherActivity.java
diff --git a/src/pedals/is/floatingjapanesedictionary/downloader/DictionaryManagerService.java b/floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/downloader/DictionaryManagerService.java
similarity index 100%
rename from src/pedals/is/floatingjapanesedictionary/downloader/DictionaryManagerService.java
rename to floatingJapaneseDictionary/src/main/java/pedals/is/floatingjapanesedictionary/downloader/DictionaryManagerService.java
diff --git a/floatingJapaneseDictionary/src/main/res/drawable-hdpi/ic_launcher.png b/floatingJapaneseDictionary/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..96a442e
Binary files /dev/null and b/floatingJapaneseDictionary/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/floatingJapaneseDictionary/src/main/res/drawable-mdpi/ic_launcher.png b/floatingJapaneseDictionary/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..359047d
Binary files /dev/null and b/floatingJapaneseDictionary/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/floatingJapaneseDictionary/src/main/res/drawable-xhdpi/ic_launcher.png b/floatingJapaneseDictionary/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..71c6d76
Binary files /dev/null and b/floatingJapaneseDictionary/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/res/layout/about_activity.xml b/floatingJapaneseDictionary/src/main/res/layout/about_activity.xml
similarity index 100%
rename from res/layout/about_activity.xml
rename to floatingJapaneseDictionary/src/main/res/layout/about_activity.xml
diff --git a/res/layout/dictionaryentry.xml b/floatingJapaneseDictionary/src/main/res/layout/dictionaryentry.xml
similarity index 100%
rename from res/layout/dictionaryentry.xml
rename to floatingJapaneseDictionary/src/main/res/layout/dictionaryentry.xml
diff --git a/res/layout/floatingdictionary.xml b/floatingJapaneseDictionary/src/main/res/layout/floatingdictionary.xml
similarity index 100%
rename from res/layout/floatingdictionary.xml
rename to floatingJapaneseDictionary/src/main/res/layout/floatingdictionary.xml
diff --git a/res/values-v11/styles.xml b/floatingJapaneseDictionary/src/main/res/values-v11/styles.xml
similarity index 100%
rename from res/values-v11/styles.xml
rename to floatingJapaneseDictionary/src/main/res/values-v11/styles.xml
diff --git a/res/values-v14/styles.xml b/floatingJapaneseDictionary/src/main/res/values-v14/styles.xml
similarity index 100%
rename from res/values-v14/styles.xml
rename to floatingJapaneseDictionary/src/main/res/values-v14/styles.xml
diff --git a/res/values/strings.xml b/floatingJapaneseDictionary/src/main/res/values/strings.xml
similarity index 100%
rename from res/values/strings.xml
rename to floatingJapaneseDictionary/src/main/res/values/strings.xml
diff --git a/res/values/styles.xml b/floatingJapaneseDictionary/src/main/res/values/styles.xml
similarity index 100%
rename from res/values/styles.xml
rename to floatingJapaneseDictionary/src/main/res/values/styles.xml
diff --git a/res/xml/searchable.xml b/floatingJapaneseDictionary/src/main/res/xml/searchable.xml
similarity index 100%
rename from res/xml/searchable.xml
rename to floatingJapaneseDictionary/src/main/res/xml/searchable.xml
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..8c0fb64
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..0c71e76
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Apr 10 15:27:10 PDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..91a7e26
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/proguard-project.txt b/proguard-project.txt
deleted file mode 100644
index f2fe155..0000000
--- a/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..7141bc2
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':floatingJapaneseDictionary'