diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 00000000..6d6f6ca8
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+sti
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 00000000..a3b3417b
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 00000000..e7bedf33
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 00000000..a19abdf9
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__asm_asm_3_1.xml b/.idea/libraries/Maven__asm_asm_3_1.xml
new file mode 100644
index 00000000..3386f109
--- /dev/null
+++ b/.idea/libraries/Maven__asm_asm_3_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__cc_mallet_mallet_2_0_7_RC2.xml b/.idea/libraries/Maven__cc_mallet_mallet_2_0_7_RC2.xml
new file mode 100644
index 00000000..cbba0163
--- /dev/null
+++ b/.idea/libraries/Maven__cc_mallet_mallet_2_0_7_RC2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__colt_colt_1_2_0.xml b/.idea/libraries/Maven__colt_colt_1_2_0.xml
new file mode 100644
index 00000000..58562acd
--- /dev/null
+++ b/.idea/libraries/Maven__colt_colt_1_2_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_beust_jcommander_1_23.xml b/.idea/libraries/Maven__com_beust_jcommander_1_23.xml
new file mode 100644
index 00000000..4c09df16
--- /dev/null
+++ b/.idea/libraries/Maven__com_beust_jcommander_1_23.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_carrotsearch_hppc_0_7_1.xml b/.idea/libraries/Maven__com_carrotsearch_hppc_0_7_1.xml
new file mode 100644
index 00000000..85695762
--- /dev/null
+++ b/.idea/libraries/Maven__com_carrotsearch_hppc_0_7_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_drewnoakes_metadata_extractor_2_4_0_beta_1.xml b/.idea/libraries/Maven__com_drewnoakes_metadata_extractor_2_4_0_beta_1.xml
new file mode 100644
index 00000000..cb52779d
--- /dev/null
+++ b/.idea/libraries/Maven__com_drewnoakes_metadata_extractor_2_4_0_beta_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_3_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_3_0.xml
new file mode 100644
index 00000000..e90bc9cb
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_3_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_5_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_5_4.xml
new file mode 100644
index 00000000..40f4bc8c
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_5_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_3_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_3_3.xml
new file mode 100644
index 00000000..4d18cebd
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_3_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_smile_2_5_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_smile_2_5_4.xml
new file mode 100644
index 00000000..48e34573
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_smile_2_5_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml b/.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml
new file mode 100644
index 00000000..04210c56
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_jsonld_java_jsonld_java_0_7_0.xml b/.idea/libraries/Maven__com_github_jsonld_java_jsonld_java_0_7_0.xml
new file mode 100644
index 00000000..151a99f4
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_jsonld_java_jsonld_java_0_7_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_mpkorstanje_simmetrics_4_1_0L.xml b/.idea/libraries/Maven__com_github_mpkorstanje_simmetrics_4_1_0L.xml
new file mode 100644
index 00000000..e5ac6c9f
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_mpkorstanje_simmetrics_4_1_0L.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_api_client_google_api_client_1_17_0_rc.xml b/.idea/libraries/Maven__com_google_api_client_google_api_client_1_17_0_rc.xml
new file mode 100644
index 00000000..15669310
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_api_client_google_api_client_1_17_0_rc.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml
new file mode 100644
index 00000000..0e668241
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_5.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_5.xml
new file mode 100644
index 00000000..80bcd5fe
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_guava_14_0_1.xml b/.idea/libraries/Maven__com_google_guava_guava_14_0_1.xml
new file mode 100644
index 00000000..b71e220d
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_guava_guava_14_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_http_client_google_http_client_1_17_0_rc.xml b/.idea/libraries/Maven__com_google_http_client_google_http_client_1_17_0_rc.xml
new file mode 100644
index 00000000..b99d62f8
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_http_client_google_http_client_1_17_0_rc.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_oauth_client_google_oauth_client_1_17_0_rc.xml b/.idea/libraries/Maven__com_google_oauth_client_google_oauth_client_1_17_0_rc.xml
new file mode 100644
index 00000000..5e62bd9d
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_oauth_client_google_oauth_client_1_17_0_rc.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_5_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_5_0.xml
new file mode 100644
index 00000000..c06d3a12
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_5_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2.xml
new file mode 100644
index 00000000..c7d304fc
--- /dev/null
+++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml b/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml
new file mode 100644
index 00000000..f3f3738f
--- /dev/null
+++ b/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_googlecode_matrix_toolkits_java_mtj_0_9_14.xml b/.idea/libraries/Maven__com_googlecode_matrix_toolkits_java_mtj_0_9_14.xml
new file mode 100644
index 00000000..24342e0a
--- /dev/null
+++ b/.idea/libraries/Maven__com_googlecode_matrix_toolkits_java_mtj_0_9_14.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_googlecode_netlib_java_netlib_java_0_9_3.xml b/.idea/libraries/Maven__com_googlecode_netlib_java_netlib_java_0_9_3.xml
new file mode 100644
index 00000000..5ed9b92e
--- /dev/null
+++ b/.idea/libraries/Maven__com_googlecode_netlib_java_netlib_java_0_9_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_spatial4j_spatial4j_0_5.xml b/.idea/libraries/Maven__com_spatial4j_spatial4j_0_5.xml
new file mode 100644
index 00000000..f6676525
--- /dev/null
+++ b/.idea/libraries/Maven__com_spatial4j_spatial4j_0_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_mail_javax_mail_1_5_2.xml b/.idea/libraries/Maven__com_sun_mail_javax_mail_1_5_2.xml
new file mode 100644
index 00000000..11ef9e9b
--- /dev/null
+++ b/.idea/libraries/Maven__com_sun_mail_javax_mail_1_5_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_tdunning_t_digest_3_1.xml b/.idea/libraries/Maven__com_tdunning_t_digest_3_1.xml
new file mode 100644
index 00000000..0bc09dfd
--- /dev/null
+++ b/.idea/libraries/Maven__com_tdunning_t_digest_3_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml b/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml
new file mode 100644
index 00000000..cec24931
--- /dev/null
+++ b/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
new file mode 100644
index 00000000..27424a17
--- /dev/null
+++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_3.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_3.xml
new file mode 100644
index 00000000..36880019
--- /dev/null
+++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml
new file mode 100644
index 00000000..a66d0394
--- /dev/null
+++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
new file mode 100644
index 00000000..13afda29
--- /dev/null
+++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_configuration_commons_configuration_1_6.xml b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_6.xml
new file mode 100644
index 00000000..ae967811
--- /dev/null
+++ b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_2_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_2_1.xml
new file mode 100644
index 00000000..e59b3ef5
--- /dev/null
+++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_2_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml
new file mode 100644
index 00000000..66e65371
--- /dev/null
+++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml
new file mode 100644
index 00000000..bc2aad0e
--- /dev/null
+++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml
new file mode 100644
index 00000000..5e8b8d33
--- /dev/null
+++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
new file mode 100644
index 00000000..2ec83767
--- /dev/null
+++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml
new file mode 100644
index 00000000..217d6e0a
--- /dev/null
+++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
new file mode 100644
index 00000000..eab40b32
--- /dev/null
+++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__concurrent_concurrent_1_3_4.xml b/.idea/libraries/Maven__concurrent_concurrent_1_3_4.xml
new file mode 100644
index 00000000..4acbd2f6
--- /dev/null
+++ b/.idea/libraries/Maven__concurrent_concurrent_1_3_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
new file mode 100644
index 00000000..14681ee8
--- /dev/null
+++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__edu_drexel_dragontool_1_3_3.xml b/.idea/libraries/Maven__edu_drexel_dragontool_1_3_3.xml
new file mode 100644
index 00000000..18d89699
--- /dev/null
+++ b/.idea/libraries/Maven__edu_drexel_dragontool_1_3_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__info_aduna_commons_aduna_commons_concurrent_2_7_0.xml b/.idea/libraries/Maven__info_aduna_commons_aduna_commons_concurrent_2_7_0.xml
new file mode 100644
index 00000000..39a1a42d
--- /dev/null
+++ b/.idea/libraries/Maven__info_aduna_commons_aduna_commons_concurrent_2_7_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__info_aduna_commons_aduna_commons_io_2_10_0.xml b/.idea/libraries/Maven__info_aduna_commons_aduna_commons_io_2_10_0.xml
new file mode 100644
index 00000000..8bcdcae8
--- /dev/null
+++ b/.idea/libraries/Maven__info_aduna_commons_aduna_commons_io_2_10_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__info_aduna_commons_aduna_commons_iteration_2_10_0.xml b/.idea/libraries/Maven__info_aduna_commons_aduna_commons_iteration_2_10_0.xml
new file mode 100644
index 00000000..f4a72815
--- /dev/null
+++ b/.idea/libraries/Maven__info_aduna_commons_aduna_commons_iteration_2_10_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__info_aduna_commons_aduna_commons_lang_2_9_0.xml b/.idea/libraries/Maven__info_aduna_commons_aduna_commons_lang_2_9_0.xml
new file mode 100644
index 00000000..7841a9d0
--- /dev/null
+++ b/.idea/libraries/Maven__info_aduna_commons_aduna_commons_lang_2_9_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__info_aduna_commons_aduna_commons_net_2_7_0.xml b/.idea/libraries/Maven__info_aduna_commons_aduna_commons_net_2_7_0.xml
new file mode 100644
index 00000000..0fa21652
--- /dev/null
+++ b/.idea/libraries/Maven__info_aduna_commons_aduna_commons_net_2_7_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__info_aduna_commons_aduna_commons_text_2_7_0.xml b/.idea/libraries/Maven__info_aduna_commons_aduna_commons_text_2_7_0.xml
new file mode 100644
index 00000000..9203ed58
--- /dev/null
+++ b/.idea/libraries/Maven__info_aduna_commons_aduna_commons_text_2_7_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__info_aduna_commons_aduna_commons_xml_2_7_0.xml b/.idea/libraries/Maven__info_aduna_commons_aduna_commons_xml_2_7_0.xml
new file mode 100644
index 00000000..ed70056f
--- /dev/null
+++ b/.idea/libraries/Maven__info_aduna_commons_aduna_commons_xml_2_7_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__info_bliki_wiki_bliki_core_3_0_19.xml b/.idea/libraries/Maven__info_bliki_wiki_bliki_core_3_0_19.xml
new file mode 100644
index 00000000..e32240c2
--- /dev/null
+++ b/.idea/libraries/Maven__info_bliki_wiki_bliki_core_3_0_19.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1_1.xml
new file mode 100644
index 00000000..bde4d358
--- /dev/null
+++ b/.idea/libraries/Maven__javax_activation_activation_1_1_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_json_javax_json_api_1_0.xml b/.idea/libraries/Maven__javax_json_javax_json_api_1_0.xml
new file mode 100644
index 00000000..f4cf4859
--- /dev/null
+++ b/.idea/libraries/Maven__javax_json_javax_json_api_1_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml
new file mode 100644
index 00000000..c24f7e30
--- /dev/null
+++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml b/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml
new file mode 100644
index 00000000..679e09a1
--- /dev/null
+++ b/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jgrapht_jgrapht_0_6_0.xml b/.idea/libraries/Maven__jgrapht_jgrapht_0_6_0.xml
new file mode 100644
index 00000000..55a6d97d
--- /dev/null
+++ b/.idea/libraries/Maven__jgrapht_jgrapht_0_6_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_2.xml b/.idea/libraries/Maven__joda_time_joda_time_2_2.xml
new file mode 100644
index 00000000..f420bd85
--- /dev/null
+++ b/.idea/libraries/Maven__joda_time_joda_time_2_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_4_10.xml b/.idea/libraries/Maven__junit_junit_4_10.xml
new file mode 100644
index 00000000..ed8bf5fe
--- /dev/null
+++ b/.idea/libraries/Maven__junit_junit_4_10.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_4_8_2.xml b/.idea/libraries/Maven__junit_junit_4_8_2.xml
new file mode 100644
index 00000000..663900e9
--- /dev/null
+++ b/.idea/libraries/Maven__junit_junit_4_8_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__log4j_log4j_1_2_14.xml b/.idea/libraries/Maven__log4j_log4j_1_2_14.xml
new file mode 100644
index 00000000..2825a674
--- /dev/null
+++ b/.idea/libraries/Maven__log4j_log4j_1_2_14.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__log4j_log4j_1_2_17.xml b/.idea/libraries/Maven__log4j_log4j_1_2_17.xml
new file mode 100644
index 00000000..e383c1bf
--- /dev/null
+++ b/.idea/libraries/Maven__log4j_log4j_1_2_17.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sf_jwordnet_jwnl_1_4_rc3.xml b/.idea/libraries/Maven__net_sf_jwordnet_jwnl_1_4_rc3.xml
new file mode 100644
index 00000000..b3458703
--- /dev/null
+++ b/.idea/libraries/Maven__net_sf_jwordnet_jwnl_1_4_rc3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sf_trove4j_trove4j_2_0_2.xml b/.idea/libraries/Maven__net_sf_trove4j_trove4j_2_0_2.xml
new file mode 100644
index 00000000..635b2138
--- /dev/null
+++ b/.idea/libraries/Maven__net_sf_trove4j_trove4j_2_0_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sourceforge_cssparser_cssparser_0_9_19.xml b/.idea/libraries/Maven__net_sourceforge_cssparser_cssparser_0_9_19.xml
new file mode 100644
index 00000000..eec0443d
--- /dev/null
+++ b/.idea/libraries/Maven__net_sourceforge_cssparser_cssparser_0_9_19.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sourceforge_f2j_arpack_combined_all_0_1.xml b/.idea/libraries/Maven__net_sourceforge_f2j_arpack_combined_all_0_1.xml
new file mode 100644
index 00000000..6bc0d9cf
--- /dev/null
+++ b/.idea/libraries/Maven__net_sourceforge_f2j_arpack_combined_all_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_2_22.xml b/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_2_22.xml
new file mode 100644
index 00000000..6bf2490d
--- /dev/null
+++ b/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_2_22.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_core_js_2_22.xml b/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_core_js_2_22.xml
new file mode 100644
index 00000000..09666d57
--- /dev/null
+++ b/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_core_js_2_22.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sourceforge_htmlunit_neko_htmlunit_2_21.xml b/.idea/libraries/Maven__net_sourceforge_htmlunit_neko_htmlunit_2_21.xml
new file mode 100644
index 00000000..a922de03
--- /dev/null
+++ b/.idea/libraries/Maven__net_sourceforge_htmlunit_neko_htmlunit_2_21.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sourceforge_nekohtml_nekohtml_1_9_14.xml b/.idea/libraries/Maven__net_sourceforge_nekohtml_nekohtml_1_9_14.xml
new file mode 100644
index 00000000..ed9a937c
--- /dev/null
+++ b/.idea/libraries/Maven__net_sourceforge_nekohtml_nekohtml_1_9_14.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_antlr4_runtime_4_5_1_1.xml b/.idea/libraries/Maven__org_antlr_antlr4_runtime_4_5_1_1.xml
new file mode 100644
index 00000000..958e1946
--- /dev/null
+++ b/.idea/libraries/Maven__org_antlr_antlr4_runtime_4_5_1_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_any23_apache_any23_core_0_7_0_incubating.xml b/.idea/libraries/Maven__org_apache_any23_apache_any23_core_0_7_0_incubating.xml
new file mode 100644
index 00000000..92a0bdff
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_any23_apache_any23_core_0_7_0_incubating.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_0.xml b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_0.xml
new file mode 100644
index 00000000..591c9ac7
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_4_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_4_1.xml
new file mode 100644
index 00000000..190209ed
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_4_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_csv_1_0.xml b/.idea/libraries/Maven__org_apache_commons_commons_csv_1_0.xml
new file mode 100644
index 00000000..bce492c8
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_csv_1_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_csv_1_0_SNAPSHOT_rev1148315.xml b/.idea/libraries/Maven__org_apache_commons_commons_csv_1_0_SNAPSHOT_rev1148315.xml
new file mode 100644
index 00000000..d12b0fb7
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_csv_1_0_SNAPSHOT_rev1148315.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_email_1_4.xml b/.idea/libraries/Maven__org_apache_commons_commons_email_1_4.xml
new file mode 100644
index 00000000..97d41c2f
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_email_1_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_exec_1_3.xml b/.idea/libraries/Maven__org_apache_commons_commons_exec_1_3.xml
new file mode 100644
index 00000000..e064a822
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_exec_1_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_1.xml
new file mode 100644
index 00000000..32bfe3b2
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_stax_api_1_0_spec_1_0_1.xml b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_stax_api_1_0_spec_1_0_1.xml
new file mode 100644
index 00000000..d76c7ab7
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_stax_api_1_0_spec_1_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_annotations_2_6_0.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_annotations_2_6_0.xml
new file mode 100644
index 00000000..e938f5a3
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_hadoop_hadoop_annotations_2_6_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_auth_2_6_0.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_auth_2_6_0.xml
new file mode 100644
index 00000000..3534446e
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_hadoop_hadoop_auth_2_6_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_common_2_6_0.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_common_2_6_0.xml
new file mode 100644
index 00000000..af6f8b7f
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_hadoop_hadoop_common_2_6_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_hdfs_2_6_0.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_hdfs_2_6_0.xml
new file mode 100644
index 00000000..68ced9de
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_hadoop_hadoop_hdfs_2_6_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_2_6.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_2_6.xml
new file mode 100644
index 00000000..d8699648
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_2_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_4_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_4_1.xml
new file mode 100644
index 00000000..bfee5185
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_4_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml
new file mode 100644
index 00000000..fdb7eada
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_cache_4_2_6.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_cache_4_2_6.xml
new file mode 100644
index 00000000..9b8a172f
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_cache_4_2_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_1.xml
new file mode 100644
index 00000000..24a6857d
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_4_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_4_1.xml
new file mode 100644
index 00000000..79ec8df8
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_4_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_jena_jena_arq_3_0_1.xml b/.idea/libraries/Maven__org_apache_jena_jena_arq_3_0_1.xml
new file mode 100644
index 00000000..3cac16a8
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_jena_jena_arq_3_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_jena_jena_base_3_0_1.xml b/.idea/libraries/Maven__org_apache_jena_jena_base_3_0_1.xml
new file mode 100644
index 00000000..14cdff7c
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_jena_jena_base_3_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_jena_jena_core_3_0_1.xml b/.idea/libraries/Maven__org_apache_jena_jena_core_3_0_1.xml
new file mode 100644
index 00000000..9a3afaa3
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_jena_jena_core_3_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_jena_jena_iri_3_0_1.xml b/.idea/libraries/Maven__org_apache_jena_jena_iri_3_0_1.xml
new file mode 100644
index 00000000..48bd0707
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_jena_jena_iri_3_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_jena_jena_shaded_guava_3_0_1.xml b/.idea/libraries/Maven__org_apache_jena_jena_shaded_guava_3_0_1.xml
new file mode 100644
index 00000000..b476c7bb
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_jena_jena_shaded_guava_3_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_analyzers_common_5_4_0.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_analyzers_common_5_4_0.xml
new file mode 100644
index 00000000..5e8f2502
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_analyzers_common_5_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_analyzers_kuromoji_5_4_0.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_analyzers_kuromoji_5_4_0.xml
new file mode 100644
index 00000000..e919f8f2
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_analyzers_kuromoji_5_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_analyzers_phonetic_5_4_0.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_analyzers_phonetic_5_4_0.xml
new file mode 100644
index 00000000..4c1fd317
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_analyzers_phonetic_5_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_backward_codecs_5_4_0.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_backward_codecs_5_4_0.xml
new file mode 100644
index 00000000..328f539d
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_backward_codecs_5_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_codecs_5_4_0.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_codecs_5_4_0.xml
new file mode 100644
index 00000000..74854f1e
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_codecs_5_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_core_5_4_0.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_core_5_4_0.xml
new file mode 100644
index 00000000..ccb0eb32
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_core_5_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_expressions_5_4_0.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_expressions_5_4_0.xml
new file mode 100644
index 00000000..0f13ce22
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_expressions_5_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_grouping_5_4_0.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_grouping_5_4_0.xml
new file mode 100644
index 00000000..09605fd1
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_grouping_5_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_highlighter_5_4_0.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_highlighter_5_4_0.xml
new file mode 100644
index 00000000..c384bf45
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_highlighter_5_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_join_5_4_0.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_join_5_4_0.xml
new file mode 100644
index 00000000..d2ba9bb2
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_join_5_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_memory_5_4_0.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_memory_5_4_0.xml
new file mode 100644
index 00000000..17b0d409
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_memory_5_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_misc_5_4_0.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_misc_5_4_0.xml
new file mode 100644
index 00000000..ee71ba6c
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_misc_5_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_queries_5_4_0.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_queries_5_4_0.xml
new file mode 100644
index 00000000..568f1c5c
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_queries_5_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_queryparser_5_4_0.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_queryparser_5_4_0.xml
new file mode 100644
index 00000000..e9fc7966
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_queryparser_5_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_sandbox_5_4_0.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_sandbox_5_4_0.xml
new file mode 100644
index 00000000..4cc0567b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_sandbox_5_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_spatial_5_4_0.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_spatial_5_4_0.xml
new file mode 100644
index 00000000..7c6cd1c5
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_spatial_5_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_lucene_lucene_suggest_5_4_0.xml b/.idea/libraries/Maven__org_apache_lucene_lucene_suggest_5_4_0.xml
new file mode 100644
index 00000000..979aebf9
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_lucene_lucene_suggest_5_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_opennlp_opennlp_tools_1_6_0.xml b/.idea/libraries/Maven__org_apache_opennlp_opennlp_tools_1_6_0.xml
new file mode 100644
index 00000000..535e9682
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_opennlp_opennlp_tools_1_6_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_pdfbox_fontbox_0_8_0_incubator.xml b/.idea/libraries/Maven__org_apache_pdfbox_fontbox_0_8_0_incubator.xml
new file mode 100644
index 00000000..a25e1b8b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_pdfbox_fontbox_0_8_0_incubator.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_pdfbox_jempbox_0_8_0_incubator.xml b/.idea/libraries/Maven__org_apache_pdfbox_jempbox_0_8_0_incubator.xml
new file mode 100644
index 00000000..b727b944
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_pdfbox_jempbox_0_8_0_incubator.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_pdfbox_pdfbox_0_8_0_incubating.xml b/.idea/libraries/Maven__org_apache_pdfbox_pdfbox_0_8_0_incubating.xml
new file mode 100644
index 00000000..05da8a2a
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_pdfbox_pdfbox_0_8_0_incubating.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_6.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_6.xml
new file mode 100644
index 00000000..af87c75c
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_poi_poi_3_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_6.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_6.xml
new file mode 100644
index 00000000..26159196
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_6.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_6.xml
new file mode 100644
index 00000000..5cbcd508
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_scratchpad_3_6.xml b/.idea/libraries/Maven__org_apache_poi_poi_scratchpad_3_6.xml
new file mode 100644
index 00000000..1486fab7
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_poi_poi_scratchpad_3_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_solr_solr_core_5_4_0.xml b/.idea/libraries/Maven__org_apache_solr_solr_core_5_4_0.xml
new file mode 100644
index 00000000..60aa5a58
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_solr_solr_core_5_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_solr_solr_solrj_5_4_0.xml b/.idea/libraries/Maven__org_apache_solr_solr_solrj_5_4_0.xml
new file mode 100644
index 00000000..0ae59570
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_solr_solr_solrj_5_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_thrift_libthrift_0_9_2.xml b/.idea/libraries/Maven__org_apache_thrift_libthrift_0_9_2.xml
new file mode 100644
index 00000000..ac1ee5b9
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_thrift_libthrift_0_9_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tika_tika_core_0_6.xml b/.idea/libraries/Maven__org_apache_tika_tika_core_0_6.xml
new file mode 100644
index 00000000..2aa3f4cb
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tika_tika_core_0_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tika_tika_parsers_0_6.xml b/.idea/libraries/Maven__org_apache_tika_tika_parsers_0_6.xml
new file mode 100644
index 00000000..7ed8030c
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tika_tika_parsers_0_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml
new file mode 100644
index 00000000..466c52c2
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_6.xml b/.idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_6.xml
new file mode 100644
index 00000000..bcf0fb2a
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml b/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml
new file mode 100644
index 00000000..d6f17aa7
--- /dev/null
+++ b/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ccil_cowan_tagsoup_tagsoup_1_2.xml b/.idea/libraries/Maven__org_ccil_cowan_tagsoup_tagsoup_1_2.xml
new file mode 100644
index 00000000..d2b98b38
--- /dev/null
+++ b/.idea/libraries/Maven__org_ccil_cowan_tagsoup_tagsoup_1_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml b/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml
new file mode 100644
index 00000000..b5106423
--- /dev/null
+++ b/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml b/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml
new file mode 100644
index 00000000..2997967e
--- /dev/null
+++ b/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_continuation_9_2_13_v20150730.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_continuation_9_2_13_v20150730.xml
new file mode 100644
index 00000000..124ba771
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_continuation_9_2_13_v20150730.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_deploy_9_2_13_v20150730.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_deploy_9_2_13_v20150730.xml
new file mode 100644
index 00000000..abb908aa
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_deploy_9_2_13_v20150730.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_2_13_v20150730.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_2_13_v20150730.xml
new file mode 100644
index 00000000..52676888
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_2_13_v20150730.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_2_13_v20150730.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_2_13_v20150730.xml
new file mode 100644
index 00000000..438bb7a3
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_2_13_v20150730.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_jmx_9_2_13_v20150730.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_jmx_9_2_13_v20150730.xml
new file mode 100644
index 00000000..3d112676
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_jmx_9_2_13_v20150730.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_rewrite_9_2_13_v20150730.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_rewrite_9_2_13_v20150730.xml
new file mode 100644
index 00000000..75526c69
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_rewrite_9_2_13_v20150730.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_2_13_v20150730.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_2_13_v20150730.xml
new file mode 100644
index 00000000..9ee79630
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_2_13_v20150730.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_2_13_v20150730.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_2_13_v20150730.xml
new file mode 100644
index 00000000..f4fd3b00
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_2_13_v20150730.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_2_13_v20150730.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_2_13_v20150730.xml
new file mode 100644
index 00000000..12dd789d
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_2_13_v20150730.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlets_9_2_13_v20150730.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlets_9_2_13_v20150730.xml
new file mode 100644
index 00000000..43a83b3a
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlets_9_2_13_v20150730.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_2_13_v20150730.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_2_13_v20150730.xml
new file mode 100644
index 00000000..8d9f58f3
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_2_13_v20150730.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_2_13_v20150730.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_2_13_v20150730.xml
new file mode 100644
index 00000000..8d02a032
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_2_13_v20150730.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_2_13_v20150730.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_2_13_v20150730.xml
new file mode 100644
index 00000000..ebba78f6
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_2_13_v20150730.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_2_17_v20160517.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_2_17_v20160517.xml
new file mode 100644
index 00000000..a9c786ad
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_2_17_v20160517.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_2_17_v20160517.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_2_17_v20160517.xml
new file mode 100644
index 00000000..45123413
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_2_17_v20160517.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_2_17_v20160517.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_2_17_v20160517.xml
new file mode 100644
index 00000000..174f98be
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_2_17_v20160517.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_glassfish_javax_json_1_0_4.xml b/.idea/libraries/Maven__org_glassfish_javax_json_1_0_4.xml
new file mode 100644
index 00000000..7fbea5f6
--- /dev/null
+++ b/.idea/libraries/Maven__org_glassfish_javax_json_1_0_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
new file mode 100644
index 00000000..acdf4430
--- /dev/null
+++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_htrace_htrace_core_3_0_4.xml b/.idea/libraries/Maven__org_htrace_htrace_core_3_0_4.xml
new file mode 100644
index 00000000..db0f8c16
--- /dev/null
+++ b/.idea/libraries/Maven__org_htrace_htrace_core_3_0_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jdom_jdom_1_1.xml b/.idea/libraries/Maven__org_jdom_jdom_1_1.xml
new file mode 100644
index 00000000..a6eefaf8
--- /dev/null
+++ b/.idea/libraries/Maven__org_jdom_jdom_1_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jooq_joox_1_4_0.xml b/.idea/libraries/Maven__org_jooq_joox_1_4_0.xml
new file mode 100644
index 00000000..c5bd0f80
--- /dev/null
+++ b/.idea/libraries/Maven__org_jooq_joox_1_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_json_json_20160212.xml b/.idea/libraries/Maven__org_json_json_20160212.xml
new file mode 100644
index 00000000..44a278c3
--- /dev/null
+++ b/.idea/libraries/Maven__org_json_json_20160212.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jsoup_jsoup_1_6_3.xml b/.idea/libraries/Maven__org_jsoup_jsoup_1_6_3.xml
new file mode 100644
index 00000000..708ba8a1
--- /dev/null
+++ b/.idea/libraries/Maven__org_jsoup_jsoup_1_6_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_noggit_noggit_0_6.xml b/.idea/libraries/Maven__org_noggit_noggit_0_6.xml
new file mode 100644
index 00000000..f3f140a9
--- /dev/null
+++ b/.idea/libraries/Maven__org_noggit_noggit_0_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_http_client_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_http_client_2_6_1.xml
new file mode 100644
index 00000000..165ee1a6
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_http_client_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_http_protocol_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_http_protocol_2_6_1.xml
new file mode 100644
index 00000000..1edaf531
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_http_protocol_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_model_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_model_2_6_1.xml
new file mode 100644
index 00000000..ec923520
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_model_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_query_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_query_2_6_1.xml
new file mode 100644
index 00000000..9a3ef251
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_query_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryalgebra_evaluation_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryalgebra_evaluation_2_6_1.xml
new file mode 100644
index 00000000..30d9ba1e
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryalgebra_evaluation_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryalgebra_model_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryalgebra_model_2_6_1.xml
new file mode 100644
index 00000000..a40e80da
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryalgebra_model_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryparser_api_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryparser_api_2_6_1.xml
new file mode 100644
index 00000000..b91a4918
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryparser_api_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryparser_serql_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryparser_serql_2_6_1.xml
new file mode 100644
index 00000000..3a3cd4cf
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryparser_serql_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_api_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_api_2_6_1.xml
new file mode 100644
index 00000000..6bba3e1e
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_api_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_sparqlxml_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_sparqlxml_2_6_1.xml
new file mode 100644
index 00000000..b64420e7
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_sparqlxml_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_api_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_api_2_6_1.xml
new file mode 100644
index 00000000..9f48073a
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_api_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_sail_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_sail_2_6_1.xml
new file mode 100644
index 00000000..23a3c641
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_sail_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_sparql_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_sparql_2_6_1.xml
new file mode 100644
index 00000000..6c39218c
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_sparql_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_api_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_api_2_6_1.xml
new file mode 100644
index 00000000..f13de3a2
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_api_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_ntriples_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_ntriples_2_6_1.xml
new file mode 100644
index 00000000..ecf3e072
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_ntriples_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_rdfxml_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_rdfxml_2_6_1.xml
new file mode 100644
index 00000000..2039c47a
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_rdfxml_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_trix_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_trix_2_6_1.xml
new file mode 100644
index 00000000..f409bd1f
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_trix_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_turtle_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_turtle_2_6_1.xml
new file mode 100644
index 00000000..de739c7b
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_turtle_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_api_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_api_2_6_1.xml
new file mode 100644
index 00000000..2875531f
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_api_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_inferencer_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_inferencer_2_6_1.xml
new file mode 100644
index 00000000..a01b08b1
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_inferencer_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_memory_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_memory_2_6_1.xml
new file mode 100644
index 00000000..130397af
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_memory_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_util_2_6_1.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_util_2_6_1.xml
new file mode 100644
index 00000000..b5e43e2c
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_util_2_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
new file mode 100644
index 00000000..0bf8cf2b
--- /dev/null
+++ b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_commons_5_0_4.xml b/.idea/libraries/Maven__org_ow2_asm_asm_commons_5_0_4.xml
new file mode 100644
index 00000000..925838c2
--- /dev/null
+++ b/.idea/libraries/Maven__org_ow2_asm_asm_commons_5_0_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_restlet_jee_org_restlet_2_3_0.xml b/.idea/libraries/Maven__org_restlet_jee_org_restlet_2_3_0.xml
new file mode 100644
index 00000000..2bec55fc
--- /dev/null
+++ b/.idea/libraries/Maven__org_restlet_jee_org_restlet_2_3_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_restlet_jee_org_restlet_ext_servlet_2_3_0.xml b/.idea/libraries/Maven__org_restlet_jee_org_restlet_ext_servlet_2_3_0.xml
new file mode 100644
index 00000000..2fee428d
--- /dev/null
+++ b/.idea/libraries/Maven__org_restlet_jee_org_restlet_ext_servlet_2_3_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_12.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_12.xml
new file mode 100644
index 00000000..5aeb229e
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_12.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml
new file mode 100644
index 00000000..282edcbe
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_12.xml
new file mode 100644
index 00000000..411efc60
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_12.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml
new file mode 100644
index 00000000..1e672600
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_12.xml b/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_12.xml
new file mode 100644
index 00000000..855bb315
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_12.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_tukaani_xz_1_0.xml b/.idea/libraries/Maven__org_tukaani_xz_1_0.xml
new file mode 100644
index 00000000..8b8042f3
--- /dev/null
+++ b/.idea/libraries/Maven__org_tukaani_xz_1_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_w3c_css_sac_1_3.xml b/.idea/libraries/Maven__org_w3c_css_sac_1_3.xml
new file mode 100644
index 00000000..af3d4146
--- /dev/null
+++ b/.idea/libraries/Maven__org_w3c_css_sac_1_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xalan_serializer_2_7_2.xml b/.idea/libraries/Maven__xalan_serializer_2_7_2.xml
new file mode 100644
index 00000000..8fd4cc95
--- /dev/null
+++ b/.idea/libraries/Maven__xalan_serializer_2_7_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xalan_xalan_2_7_2.xml b/.idea/libraries/Maven__xalan_xalan_2_7_2.xml
new file mode 100644
index 00000000..c806972a
--- /dev/null
+++ b/.idea/libraries/Maven__xalan_xalan_2_7_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml b/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml
new file mode 100644
index 00000000..285d5e89
--- /dev/null
+++ b/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml b/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml
new file mode 100644
index 00000000..19d39dba
--- /dev/null
+++ b/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xml_apis_xml_apis_1_3_04.xml b/.idea/libraries/Maven__xml_apis_xml_apis_1_3_04.xml
new file mode 100644
index 00000000..891caa2f
--- /dev/null
+++ b/.idea/libraries/Maven__xml_apis_xml_apis_1_3_04.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml b/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml
new file mode 100644
index 00000000..9aadd291
--- /dev/null
+++ b/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..d25e0b43
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.8
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..5c7624e7
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 00000000..e96534fb
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..94a25f7f
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 00000000..fb108d86
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1278 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1469545899779
+
+ 1469545899779
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/any23-sti/pom.xml b/any23-sti/pom.xml
deleted file mode 100644
index 4dbc72e8..00000000
--- a/any23-sti/pom.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-
- 4.0.0
- uk.ac.shef.dcs
- any23-sti
- 1.0
-
- src
-
-
- maven-compiler-plugin
- 2.3.2
-
-
-
-
-
-
- maven-assembly-plugin
- 2.2.1
-
-
- jar-with-dependencies
-
-
-
-
-
-
- make-assembly
-
- package
-
-
- single
-
-
-
-
-
-
-
- true
- org.apache.maven.plugins
- maven-compiler-plugin
-
- 1.8
- 1.8
- UTF-8
-
-
-
-
-
-
-
-
- org.apache.any23
- apache-any23-core
- 0.7.0-incubating
-
-
- org.slf4j
- slf4j-api
-
-
- org.slf4j
- slf4j-jdk14
-
-
- org.slf4j
- jcl-over-slf4j
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/kbsearch.properties b/config/kbsearch.properties
similarity index 100%
rename from kbsearch.properties
rename to config/kbsearch.properties
diff --git a/resources/sti.imdb.properties b/config/sti.imdb.properties
similarity index 100%
rename from resources/sti.imdb.properties
rename to config/sti.imdb.properties
diff --git a/resources/sti.musicbrainz.properties b/config/sti.musicbrainz.properties
similarity index 100%
rename from resources/sti.musicbrainz.properties
rename to config/sti.musicbrainz.properties
diff --git a/sti.properties b/config/sti.properties
similarity index 100%
rename from sti.properties
rename to config/sti.properties
diff --git a/websearch.properties b/config/websearch.properties
similarity index 100%
rename from websearch.properties
rename to config/websearch.properties
diff --git a/core/log4j.properties b/core/log4j.properties
deleted file mode 100644
index 7715bfbc..00000000
--- a/core/log4j.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# Root logger option
-# switch logging level for other options(TRACE, DEBUG, INFO, WARN, ERROR, FATAL)
-log4j.rootLogger=ERROR, file, stdout
-
-# Direct LOG messages to a LOG file
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=sti.log
-log4j.appender.file.MaxFileSize=10MB
-log4j.appender.file.MaxBackupIndex=10
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-log4j.logger.uk.ac.shef.dcs=INFO,myappender
-log4j.logger.uk.ac.shef.dcs.kbsearch=INFO,myappender
-
-# Direct LOG messages to stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-log4j.appender.myappender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.myappender.datePattern='-'dd'.log'
-log4j.appender.myappender.File=sti.log
-log4j.appender.myappender.layout=org.apache.log4j.PatternLayout
-log4j.appender.myappender.layout.ConversionPattern=%-6r %d{ISO8601} %-5p %40.40c %x - %m%n
\ No newline at end of file
diff --git a/mvninstall.bat b/mvninstall.bat
deleted file mode 100755
index 72a7f991..00000000
--- a/mvninstall.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-mvn install:install-file -DgroupId=nlp.dragontools -DartifactId=dragontools -Dversion=1.0 -Dpackaging=jar -Dfile=libs/dragontool.jar
-mvn install:install-file -DgroupId=com.github.mpkorstanje -DartifactId=simmetrics -Dversion=4.1.0L -Dpackaging=jar -Dfile=libs/simmetrics.jar
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 00000000..a89ab6f4
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,167 @@
+
+
+ 4.0.0
+
+ uk.ac.shef.dcs
+ sti
+ 1.0alpha
+ pom
+
+
+ UTF-8
+ UTF-8
+ 2.5.2
+ 3.5.1
+ 2.2.1
+ 1.4.0
+ 2.3
+
+
+
+ Apache 2.0
+ http://www.apache.org/licenses/LICENSE-2.0
+
+
+
+
+ sti-any23
+ sti-common-util
+ sti-kbsearch
+ sti-websearch
+ sti-main
+
+
+
+
+
+ ossrh
+ https://oss.sonatype.org/content/repositories/snapshots
+
+
+ ossrh
+ https://oss.sonatype.org/service/local/staging/deploy/maven2/
+
+
+
+ install
+
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ 1.6.3
+ true
+
+ ossrh
+ https://oss.sonatype.org/
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ ${maven-source-plugin.version}
+
+
+ attach-sources
+ verify
+
+ jar
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-install-plugin
+ ${maven-install-plugin.version}
+
+
+ install-external-dragontool
+ clean
+
+ ${basedir}/libs/dragontool.jar
+ default
+ edu.drexel
+ dragontool
+ 1.3.3
+ jar
+ true
+
+
+ install-file
+
+
+
+ install-external-simmetrics
+ clean
+
+ ${basedir}/libs/simmetrics.jar
+ default
+ com.github.mpkorstanje
+ simmetrics
+ 4.1.0L
+ jar
+ true
+
+
+ install-file
+
+
+
+
+
+
+ org.codehaus.mojo
+ exec-maven-plugin
+ ${exec-maven-plugin.version}
+
+
+
+
+
+ true
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ ${maven-compiler-plugin.version}
+
+ 1.8
+ 1.8
+ UTF-8
+
+
+
+ maven-shade-plugin
+ org.apache.maven.plugins
+ ${maven-shade-plugin.version}
+
+
+
+
+ *:*
+
+ META-INF/*.SF
+ META-INF/*.DSA
+ META-INF/*.RSA
+
+
+
+
+
+
+ package
+
+ shade
+
+
+ true
+ jar-with-dependencies
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/cache/empty/class/conf/currency.xml b/resources/cache/empty/class/conf/currency.xml
similarity index 100%
rename from cache/empty/class/conf/currency.xml
rename to resources/cache/empty/class/conf/currency.xml
diff --git a/cache/empty/class/conf/elevate.xml b/resources/cache/empty/class/conf/elevate.xml
similarity index 100%
rename from cache/empty/class/conf/elevate.xml
rename to resources/cache/empty/class/conf/elevate.xml
diff --git a/cache/empty/class/conf/lang/contractions_ca.txt b/resources/cache/empty/class/conf/lang/contractions_ca.txt
similarity index 100%
rename from cache/empty/class/conf/lang/contractions_ca.txt
rename to resources/cache/empty/class/conf/lang/contractions_ca.txt
diff --git a/cache/empty/class/conf/lang/contractions_fr.txt b/resources/cache/empty/class/conf/lang/contractions_fr.txt
similarity index 100%
rename from cache/empty/class/conf/lang/contractions_fr.txt
rename to resources/cache/empty/class/conf/lang/contractions_fr.txt
diff --git a/cache/empty/class/conf/lang/contractions_ga.txt b/resources/cache/empty/class/conf/lang/contractions_ga.txt
similarity index 100%
rename from cache/empty/class/conf/lang/contractions_ga.txt
rename to resources/cache/empty/class/conf/lang/contractions_ga.txt
diff --git a/cache/empty/class/conf/lang/contractions_it.txt b/resources/cache/empty/class/conf/lang/contractions_it.txt
similarity index 100%
rename from cache/empty/class/conf/lang/contractions_it.txt
rename to resources/cache/empty/class/conf/lang/contractions_it.txt
diff --git a/cache/empty/class/conf/lang/hyphenations_ga.txt b/resources/cache/empty/class/conf/lang/hyphenations_ga.txt
similarity index 100%
rename from cache/empty/class/conf/lang/hyphenations_ga.txt
rename to resources/cache/empty/class/conf/lang/hyphenations_ga.txt
diff --git a/cache/empty/class/conf/lang/stemdict_nl.txt b/resources/cache/empty/class/conf/lang/stemdict_nl.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stemdict_nl.txt
rename to resources/cache/empty/class/conf/lang/stemdict_nl.txt
diff --git a/cache/empty/class/conf/lang/stoptags_ja.txt b/resources/cache/empty/class/conf/lang/stoptags_ja.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stoptags_ja.txt
rename to resources/cache/empty/class/conf/lang/stoptags_ja.txt
diff --git a/cache/empty/class/conf/lang/stopwords_ar.txt b/resources/cache/empty/class/conf/lang/stopwords_ar.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_ar.txt
rename to resources/cache/empty/class/conf/lang/stopwords_ar.txt
diff --git a/cache/empty/class/conf/lang/stopwords_bg.txt b/resources/cache/empty/class/conf/lang/stopwords_bg.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_bg.txt
rename to resources/cache/empty/class/conf/lang/stopwords_bg.txt
diff --git a/cache/empty/class/conf/lang/stopwords_ca.txt b/resources/cache/empty/class/conf/lang/stopwords_ca.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_ca.txt
rename to resources/cache/empty/class/conf/lang/stopwords_ca.txt
diff --git a/cache/empty/class/conf/lang/stopwords_cz.txt b/resources/cache/empty/class/conf/lang/stopwords_cz.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_cz.txt
rename to resources/cache/empty/class/conf/lang/stopwords_cz.txt
diff --git a/cache/empty/class/conf/lang/stopwords_da.txt b/resources/cache/empty/class/conf/lang/stopwords_da.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_da.txt
rename to resources/cache/empty/class/conf/lang/stopwords_da.txt
diff --git a/cache/empty/class/conf/lang/stopwords_de.txt b/resources/cache/empty/class/conf/lang/stopwords_de.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_de.txt
rename to resources/cache/empty/class/conf/lang/stopwords_de.txt
diff --git a/cache/empty/class/conf/lang/stopwords_el.txt b/resources/cache/empty/class/conf/lang/stopwords_el.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_el.txt
rename to resources/cache/empty/class/conf/lang/stopwords_el.txt
diff --git a/cache/empty/class/conf/lang/stopwords_en.txt b/resources/cache/empty/class/conf/lang/stopwords_en.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_en.txt
rename to resources/cache/empty/class/conf/lang/stopwords_en.txt
diff --git a/cache/empty/class/conf/lang/stopwords_es.txt b/resources/cache/empty/class/conf/lang/stopwords_es.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_es.txt
rename to resources/cache/empty/class/conf/lang/stopwords_es.txt
diff --git a/cache/empty/class/conf/lang/stopwords_eu.txt b/resources/cache/empty/class/conf/lang/stopwords_eu.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_eu.txt
rename to resources/cache/empty/class/conf/lang/stopwords_eu.txt
diff --git a/cache/empty/class/conf/lang/stopwords_fa.txt b/resources/cache/empty/class/conf/lang/stopwords_fa.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_fa.txt
rename to resources/cache/empty/class/conf/lang/stopwords_fa.txt
diff --git a/cache/empty/class/conf/lang/stopwords_fi.txt b/resources/cache/empty/class/conf/lang/stopwords_fi.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_fi.txt
rename to resources/cache/empty/class/conf/lang/stopwords_fi.txt
diff --git a/cache/empty/class/conf/lang/stopwords_fr.txt b/resources/cache/empty/class/conf/lang/stopwords_fr.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_fr.txt
rename to resources/cache/empty/class/conf/lang/stopwords_fr.txt
diff --git a/cache/empty/class/conf/lang/stopwords_ga.txt b/resources/cache/empty/class/conf/lang/stopwords_ga.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_ga.txt
rename to resources/cache/empty/class/conf/lang/stopwords_ga.txt
diff --git a/cache/empty/class/conf/lang/stopwords_gl.txt b/resources/cache/empty/class/conf/lang/stopwords_gl.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_gl.txt
rename to resources/cache/empty/class/conf/lang/stopwords_gl.txt
diff --git a/cache/empty/class/conf/lang/stopwords_hi.txt b/resources/cache/empty/class/conf/lang/stopwords_hi.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_hi.txt
rename to resources/cache/empty/class/conf/lang/stopwords_hi.txt
diff --git a/cache/empty/class/conf/lang/stopwords_hu.txt b/resources/cache/empty/class/conf/lang/stopwords_hu.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_hu.txt
rename to resources/cache/empty/class/conf/lang/stopwords_hu.txt
diff --git a/cache/empty/class/conf/lang/stopwords_hy.txt b/resources/cache/empty/class/conf/lang/stopwords_hy.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_hy.txt
rename to resources/cache/empty/class/conf/lang/stopwords_hy.txt
diff --git a/cache/empty/class/conf/lang/stopwords_id.txt b/resources/cache/empty/class/conf/lang/stopwords_id.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_id.txt
rename to resources/cache/empty/class/conf/lang/stopwords_id.txt
diff --git a/cache/empty/class/conf/lang/stopwords_it.txt b/resources/cache/empty/class/conf/lang/stopwords_it.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_it.txt
rename to resources/cache/empty/class/conf/lang/stopwords_it.txt
diff --git a/cache/empty/class/conf/lang/stopwords_ja.txt b/resources/cache/empty/class/conf/lang/stopwords_ja.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_ja.txt
rename to resources/cache/empty/class/conf/lang/stopwords_ja.txt
diff --git a/cache/empty/class/conf/lang/stopwords_lv.txt b/resources/cache/empty/class/conf/lang/stopwords_lv.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_lv.txt
rename to resources/cache/empty/class/conf/lang/stopwords_lv.txt
diff --git a/cache/empty/class/conf/lang/stopwords_nl.txt b/resources/cache/empty/class/conf/lang/stopwords_nl.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_nl.txt
rename to resources/cache/empty/class/conf/lang/stopwords_nl.txt
diff --git a/cache/empty/class/conf/lang/stopwords_no.txt b/resources/cache/empty/class/conf/lang/stopwords_no.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_no.txt
rename to resources/cache/empty/class/conf/lang/stopwords_no.txt
diff --git a/cache/empty/class/conf/lang/stopwords_pt.txt b/resources/cache/empty/class/conf/lang/stopwords_pt.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_pt.txt
rename to resources/cache/empty/class/conf/lang/stopwords_pt.txt
diff --git a/cache/empty/class/conf/lang/stopwords_ro.txt b/resources/cache/empty/class/conf/lang/stopwords_ro.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_ro.txt
rename to resources/cache/empty/class/conf/lang/stopwords_ro.txt
diff --git a/cache/empty/class/conf/lang/stopwords_ru.txt b/resources/cache/empty/class/conf/lang/stopwords_ru.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_ru.txt
rename to resources/cache/empty/class/conf/lang/stopwords_ru.txt
diff --git a/cache/empty/class/conf/lang/stopwords_sv.txt b/resources/cache/empty/class/conf/lang/stopwords_sv.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_sv.txt
rename to resources/cache/empty/class/conf/lang/stopwords_sv.txt
diff --git a/cache/empty/class/conf/lang/stopwords_th.txt b/resources/cache/empty/class/conf/lang/stopwords_th.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_th.txt
rename to resources/cache/empty/class/conf/lang/stopwords_th.txt
diff --git a/cache/empty/class/conf/lang/stopwords_tr.txt b/resources/cache/empty/class/conf/lang/stopwords_tr.txt
similarity index 100%
rename from cache/empty/class/conf/lang/stopwords_tr.txt
rename to resources/cache/empty/class/conf/lang/stopwords_tr.txt
diff --git a/cache/empty/class/conf/lang/userdict_ja.txt b/resources/cache/empty/class/conf/lang/userdict_ja.txt
similarity index 100%
rename from cache/empty/class/conf/lang/userdict_ja.txt
rename to resources/cache/empty/class/conf/lang/userdict_ja.txt
diff --git a/cache/empty/class/conf/params.json b/resources/cache/empty/class/conf/params.json
similarity index 100%
rename from cache/empty/class/conf/params.json
rename to resources/cache/empty/class/conf/params.json
diff --git a/cache/empty/class/conf/protwords.txt b/resources/cache/empty/class/conf/protwords.txt
similarity index 100%
rename from cache/empty/class/conf/protwords.txt
rename to resources/cache/empty/class/conf/protwords.txt
diff --git a/cache/empty/class/conf/schema.xml b/resources/cache/empty/class/conf/schema.xml
similarity index 100%
rename from cache/empty/class/conf/schema.xml
rename to resources/cache/empty/class/conf/schema.xml
diff --git a/cache/empty/class/conf/solrconfig.xml b/resources/cache/empty/class/conf/solrconfig.xml
similarity index 100%
rename from cache/empty/class/conf/solrconfig.xml
rename to resources/cache/empty/class/conf/solrconfig.xml
diff --git a/cache/empty/class/conf/stopwords.txt b/resources/cache/empty/class/conf/stopwords.txt
similarity index 100%
rename from cache/empty/class/conf/stopwords.txt
rename to resources/cache/empty/class/conf/stopwords.txt
diff --git a/cache/empty/class/conf/synonyms.txt b/resources/cache/empty/class/conf/synonyms.txt
similarity index 100%
rename from cache/empty/class/conf/synonyms.txt
rename to resources/cache/empty/class/conf/synonyms.txt
diff --git a/cache/empty/class/core.properties b/resources/cache/empty/class/core.properties
similarity index 100%
rename from cache/empty/class/core.properties
rename to resources/cache/empty/class/core.properties
diff --git a/resources/cache/empty/class/data/index/segments_1 b/resources/cache/empty/class/data/index/segments_1
new file mode 100644
index 00000000..d963f8e9
Binary files /dev/null and b/resources/cache/empty/class/data/index/segments_1 differ
diff --git a/cache/empty/similarity/data/index/write.lock b/resources/cache/empty/class/data/index/write.lock
similarity index 100%
rename from cache/empty/similarity/data/index/write.lock
rename to resources/cache/empty/class/data/index/write.lock
diff --git a/cache/empty/entity/conf/currency.xml b/resources/cache/empty/entity/conf/currency.xml
similarity index 100%
rename from cache/empty/entity/conf/currency.xml
rename to resources/cache/empty/entity/conf/currency.xml
diff --git a/cache/empty/entity/conf/elevate.xml b/resources/cache/empty/entity/conf/elevate.xml
similarity index 100%
rename from cache/empty/entity/conf/elevate.xml
rename to resources/cache/empty/entity/conf/elevate.xml
diff --git a/cache/empty/entity/conf/lang/contractions_ca.txt b/resources/cache/empty/entity/conf/lang/contractions_ca.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/contractions_ca.txt
rename to resources/cache/empty/entity/conf/lang/contractions_ca.txt
diff --git a/cache/empty/entity/conf/lang/contractions_fr.txt b/resources/cache/empty/entity/conf/lang/contractions_fr.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/contractions_fr.txt
rename to resources/cache/empty/entity/conf/lang/contractions_fr.txt
diff --git a/cache/empty/entity/conf/lang/contractions_ga.txt b/resources/cache/empty/entity/conf/lang/contractions_ga.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/contractions_ga.txt
rename to resources/cache/empty/entity/conf/lang/contractions_ga.txt
diff --git a/cache/empty/entity/conf/lang/contractions_it.txt b/resources/cache/empty/entity/conf/lang/contractions_it.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/contractions_it.txt
rename to resources/cache/empty/entity/conf/lang/contractions_it.txt
diff --git a/cache/empty/entity/conf/lang/hyphenations_ga.txt b/resources/cache/empty/entity/conf/lang/hyphenations_ga.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/hyphenations_ga.txt
rename to resources/cache/empty/entity/conf/lang/hyphenations_ga.txt
diff --git a/cache/empty/entity/conf/lang/stemdict_nl.txt b/resources/cache/empty/entity/conf/lang/stemdict_nl.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stemdict_nl.txt
rename to resources/cache/empty/entity/conf/lang/stemdict_nl.txt
diff --git a/cache/empty/entity/conf/lang/stoptags_ja.txt b/resources/cache/empty/entity/conf/lang/stoptags_ja.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stoptags_ja.txt
rename to resources/cache/empty/entity/conf/lang/stoptags_ja.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_ar.txt b/resources/cache/empty/entity/conf/lang/stopwords_ar.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_ar.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_ar.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_bg.txt b/resources/cache/empty/entity/conf/lang/stopwords_bg.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_bg.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_bg.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_ca.txt b/resources/cache/empty/entity/conf/lang/stopwords_ca.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_ca.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_ca.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_cz.txt b/resources/cache/empty/entity/conf/lang/stopwords_cz.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_cz.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_cz.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_da.txt b/resources/cache/empty/entity/conf/lang/stopwords_da.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_da.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_da.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_de.txt b/resources/cache/empty/entity/conf/lang/stopwords_de.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_de.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_de.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_el.txt b/resources/cache/empty/entity/conf/lang/stopwords_el.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_el.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_el.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_en.txt b/resources/cache/empty/entity/conf/lang/stopwords_en.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_en.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_en.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_es.txt b/resources/cache/empty/entity/conf/lang/stopwords_es.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_es.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_es.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_eu.txt b/resources/cache/empty/entity/conf/lang/stopwords_eu.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_eu.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_eu.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_fa.txt b/resources/cache/empty/entity/conf/lang/stopwords_fa.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_fa.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_fa.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_fi.txt b/resources/cache/empty/entity/conf/lang/stopwords_fi.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_fi.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_fi.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_fr.txt b/resources/cache/empty/entity/conf/lang/stopwords_fr.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_fr.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_fr.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_ga.txt b/resources/cache/empty/entity/conf/lang/stopwords_ga.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_ga.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_ga.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_gl.txt b/resources/cache/empty/entity/conf/lang/stopwords_gl.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_gl.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_gl.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_hi.txt b/resources/cache/empty/entity/conf/lang/stopwords_hi.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_hi.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_hi.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_hu.txt b/resources/cache/empty/entity/conf/lang/stopwords_hu.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_hu.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_hu.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_hy.txt b/resources/cache/empty/entity/conf/lang/stopwords_hy.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_hy.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_hy.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_id.txt b/resources/cache/empty/entity/conf/lang/stopwords_id.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_id.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_id.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_it.txt b/resources/cache/empty/entity/conf/lang/stopwords_it.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_it.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_it.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_ja.txt b/resources/cache/empty/entity/conf/lang/stopwords_ja.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_ja.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_ja.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_lv.txt b/resources/cache/empty/entity/conf/lang/stopwords_lv.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_lv.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_lv.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_nl.txt b/resources/cache/empty/entity/conf/lang/stopwords_nl.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_nl.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_nl.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_no.txt b/resources/cache/empty/entity/conf/lang/stopwords_no.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_no.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_no.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_pt.txt b/resources/cache/empty/entity/conf/lang/stopwords_pt.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_pt.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_pt.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_ro.txt b/resources/cache/empty/entity/conf/lang/stopwords_ro.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_ro.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_ro.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_ru.txt b/resources/cache/empty/entity/conf/lang/stopwords_ru.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_ru.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_ru.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_sv.txt b/resources/cache/empty/entity/conf/lang/stopwords_sv.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_sv.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_sv.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_th.txt b/resources/cache/empty/entity/conf/lang/stopwords_th.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_th.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_th.txt
diff --git a/cache/empty/entity/conf/lang/stopwords_tr.txt b/resources/cache/empty/entity/conf/lang/stopwords_tr.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/stopwords_tr.txt
rename to resources/cache/empty/entity/conf/lang/stopwords_tr.txt
diff --git a/cache/empty/entity/conf/lang/userdict_ja.txt b/resources/cache/empty/entity/conf/lang/userdict_ja.txt
similarity index 100%
rename from cache/empty/entity/conf/lang/userdict_ja.txt
rename to resources/cache/empty/entity/conf/lang/userdict_ja.txt
diff --git a/cache/empty/entity/conf/params.json b/resources/cache/empty/entity/conf/params.json
similarity index 100%
rename from cache/empty/entity/conf/params.json
rename to resources/cache/empty/entity/conf/params.json
diff --git a/cache/empty/entity/conf/protwords.txt b/resources/cache/empty/entity/conf/protwords.txt
similarity index 100%
rename from cache/empty/entity/conf/protwords.txt
rename to resources/cache/empty/entity/conf/protwords.txt
diff --git a/cache/empty/entity/conf/schema.xml b/resources/cache/empty/entity/conf/schema.xml
similarity index 100%
rename from cache/empty/entity/conf/schema.xml
rename to resources/cache/empty/entity/conf/schema.xml
diff --git a/cache/empty/entity/conf/solrconfig.xml b/resources/cache/empty/entity/conf/solrconfig.xml
similarity index 100%
rename from cache/empty/entity/conf/solrconfig.xml
rename to resources/cache/empty/entity/conf/solrconfig.xml
diff --git a/cache/empty/entity/conf/stopwords.txt b/resources/cache/empty/entity/conf/stopwords.txt
similarity index 100%
rename from cache/empty/entity/conf/stopwords.txt
rename to resources/cache/empty/entity/conf/stopwords.txt
diff --git a/cache/empty/entity/conf/synonyms.txt b/resources/cache/empty/entity/conf/synonyms.txt
similarity index 100%
rename from cache/empty/entity/conf/synonyms.txt
rename to resources/cache/empty/entity/conf/synonyms.txt
diff --git a/cache/empty/entity/core.properties b/resources/cache/empty/entity/core.properties
similarity index 100%
rename from cache/empty/entity/core.properties
rename to resources/cache/empty/entity/core.properties
diff --git a/resources/cache/empty/entity/data/index/_ece.fdt b/resources/cache/empty/entity/data/index/_ece.fdt
new file mode 100644
index 00000000..750cac48
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ece.fdt differ
diff --git a/resources/cache/empty/entity/data/index/_ece.fdx b/resources/cache/empty/entity/data/index/_ece.fdx
new file mode 100644
index 00000000..279833fd
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ece.fdx differ
diff --git a/resources/cache/empty/entity/data/index/_ece.fnm b/resources/cache/empty/entity/data/index/_ece.fnm
new file mode 100644
index 00000000..a20d63c8
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ece.fnm differ
diff --git a/resources/cache/empty/entity/data/index/_ece.nvd b/resources/cache/empty/entity/data/index/_ece.nvd
new file mode 100644
index 00000000..ff50af58
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ece.nvd differ
diff --git a/resources/cache/empty/entity/data/index/_ece.nvm b/resources/cache/empty/entity/data/index/_ece.nvm
new file mode 100644
index 00000000..e759531f
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ece.nvm differ
diff --git a/resources/cache/empty/entity/data/index/_ece.si b/resources/cache/empty/entity/data/index/_ece.si
new file mode 100644
index 00000000..6171a082
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ece.si differ
diff --git a/resources/cache/empty/entity/data/index/_ece_Lucene50_0.doc b/resources/cache/empty/entity/data/index/_ece_Lucene50_0.doc
new file mode 100644
index 00000000..a4d5f170
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ece_Lucene50_0.doc differ
diff --git a/resources/cache/empty/entity/data/index/_ece_Lucene50_0.pos b/resources/cache/empty/entity/data/index/_ece_Lucene50_0.pos
new file mode 100644
index 00000000..606b9d09
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ece_Lucene50_0.pos differ
diff --git a/resources/cache/empty/entity/data/index/_ece_Lucene50_0.tim b/resources/cache/empty/entity/data/index/_ece_Lucene50_0.tim
new file mode 100644
index 00000000..b66fd45d
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ece_Lucene50_0.tim differ
diff --git a/resources/cache/empty/entity/data/index/_ece_Lucene50_0.tip b/resources/cache/empty/entity/data/index/_ece_Lucene50_0.tip
new file mode 100644
index 00000000..3085f737
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ece_Lucene50_0.tip differ
diff --git a/resources/cache/empty/entity/data/index/_ecf.fdt b/resources/cache/empty/entity/data/index/_ecf.fdt
new file mode 100644
index 00000000..e317e630
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ecf.fdt differ
diff --git a/resources/cache/empty/entity/data/index/_ecf.fdx b/resources/cache/empty/entity/data/index/_ecf.fdx
new file mode 100644
index 00000000..421d7873
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ecf.fdx differ
diff --git a/resources/cache/empty/entity/data/index/_ecf.fnm b/resources/cache/empty/entity/data/index/_ecf.fnm
new file mode 100644
index 00000000..5eab62ff
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ecf.fnm differ
diff --git a/resources/cache/empty/entity/data/index/_ecf.nvd b/resources/cache/empty/entity/data/index/_ecf.nvd
new file mode 100644
index 00000000..9602f3f9
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ecf.nvd differ
diff --git a/resources/cache/empty/entity/data/index/_ecf.nvm b/resources/cache/empty/entity/data/index/_ecf.nvm
new file mode 100644
index 00000000..dd79a9bd
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ecf.nvm differ
diff --git a/resources/cache/empty/entity/data/index/_ecf.si b/resources/cache/empty/entity/data/index/_ecf.si
new file mode 100644
index 00000000..6b66588a
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ecf.si differ
diff --git a/resources/cache/empty/entity/data/index/_ecf_Lucene50_0.doc b/resources/cache/empty/entity/data/index/_ecf_Lucene50_0.doc
new file mode 100644
index 00000000..ebf494be
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ecf_Lucene50_0.doc differ
diff --git a/resources/cache/empty/entity/data/index/_ecf_Lucene50_0.pos b/resources/cache/empty/entity/data/index/_ecf_Lucene50_0.pos
new file mode 100644
index 00000000..33b84ae2
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ecf_Lucene50_0.pos differ
diff --git a/resources/cache/empty/entity/data/index/_ecf_Lucene50_0.tim b/resources/cache/empty/entity/data/index/_ecf_Lucene50_0.tim
new file mode 100644
index 00000000..8d75bc3e
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ecf_Lucene50_0.tim differ
diff --git a/resources/cache/empty/entity/data/index/_ecf_Lucene50_0.tip b/resources/cache/empty/entity/data/index/_ecf_Lucene50_0.tip
new file mode 100644
index 00000000..b1507770
Binary files /dev/null and b/resources/cache/empty/entity/data/index/_ecf_Lucene50_0.tip differ
diff --git a/resources/cache/empty/entity/data/index/segments_cww b/resources/cache/empty/entity/data/index/segments_cww
new file mode 100644
index 00000000..a6ef02b2
Binary files /dev/null and b/resources/cache/empty/entity/data/index/segments_cww differ
diff --git a/resources/cache/empty/entity/data/index/write.lock b/resources/cache/empty/entity/data/index/write.lock
new file mode 100644
index 00000000..e69de29b
diff --git a/resources/cache/empty/entity/data/tlog/tlog.0000000000000016723 b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016723
new file mode 100644
index 00000000..bf455fda
Binary files /dev/null and b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016723 differ
diff --git a/resources/cache/empty/entity/data/tlog/tlog.0000000000000016724 b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016724
new file mode 100644
index 00000000..3d1dbcbf
Binary files /dev/null and b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016724 differ
diff --git a/resources/cache/empty/entity/data/tlog/tlog.0000000000000016725 b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016725
new file mode 100644
index 00000000..caca6345
Binary files /dev/null and b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016725 differ
diff --git a/resources/cache/empty/entity/data/tlog/tlog.0000000000000016726 b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016726
new file mode 100644
index 00000000..f8aecd66
Binary files /dev/null and b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016726 differ
diff --git a/resources/cache/empty/entity/data/tlog/tlog.0000000000000016727 b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016727
new file mode 100644
index 00000000..09b613e1
Binary files /dev/null and b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016727 differ
diff --git a/resources/cache/empty/entity/data/tlog/tlog.0000000000000016728 b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016728
new file mode 100644
index 00000000..deed6f9c
Binary files /dev/null and b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016728 differ
diff --git a/resources/cache/empty/entity/data/tlog/tlog.0000000000000016729 b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016729
new file mode 100644
index 00000000..9fd17c3c
Binary files /dev/null and b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016729 differ
diff --git a/resources/cache/empty/entity/data/tlog/tlog.0000000000000016730 b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016730
new file mode 100644
index 00000000..82dbeb4b
Binary files /dev/null and b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016730 differ
diff --git a/resources/cache/empty/entity/data/tlog/tlog.0000000000000016731 b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016731
new file mode 100644
index 00000000..d6722266
Binary files /dev/null and b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016731 differ
diff --git a/resources/cache/empty/entity/data/tlog/tlog.0000000000000016732 b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016732
new file mode 100644
index 00000000..37106a3d
Binary files /dev/null and b/resources/cache/empty/entity/data/tlog/tlog.0000000000000016732 differ
diff --git a/cache/empty/relation/conf/currency.xml b/resources/cache/empty/relation/conf/currency.xml
similarity index 100%
rename from cache/empty/relation/conf/currency.xml
rename to resources/cache/empty/relation/conf/currency.xml
diff --git a/cache/empty/relation/conf/elevate.xml b/resources/cache/empty/relation/conf/elevate.xml
similarity index 100%
rename from cache/empty/relation/conf/elevate.xml
rename to resources/cache/empty/relation/conf/elevate.xml
diff --git a/cache/empty/relation/conf/lang/contractions_ca.txt b/resources/cache/empty/relation/conf/lang/contractions_ca.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/contractions_ca.txt
rename to resources/cache/empty/relation/conf/lang/contractions_ca.txt
diff --git a/cache/empty/relation/conf/lang/contractions_fr.txt b/resources/cache/empty/relation/conf/lang/contractions_fr.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/contractions_fr.txt
rename to resources/cache/empty/relation/conf/lang/contractions_fr.txt
diff --git a/cache/empty/relation/conf/lang/contractions_ga.txt b/resources/cache/empty/relation/conf/lang/contractions_ga.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/contractions_ga.txt
rename to resources/cache/empty/relation/conf/lang/contractions_ga.txt
diff --git a/cache/empty/relation/conf/lang/contractions_it.txt b/resources/cache/empty/relation/conf/lang/contractions_it.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/contractions_it.txt
rename to resources/cache/empty/relation/conf/lang/contractions_it.txt
diff --git a/cache/empty/relation/conf/lang/hyphenations_ga.txt b/resources/cache/empty/relation/conf/lang/hyphenations_ga.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/hyphenations_ga.txt
rename to resources/cache/empty/relation/conf/lang/hyphenations_ga.txt
diff --git a/cache/empty/relation/conf/lang/stemdict_nl.txt b/resources/cache/empty/relation/conf/lang/stemdict_nl.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stemdict_nl.txt
rename to resources/cache/empty/relation/conf/lang/stemdict_nl.txt
diff --git a/cache/empty/relation/conf/lang/stoptags_ja.txt b/resources/cache/empty/relation/conf/lang/stoptags_ja.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stoptags_ja.txt
rename to resources/cache/empty/relation/conf/lang/stoptags_ja.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_ar.txt b/resources/cache/empty/relation/conf/lang/stopwords_ar.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_ar.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_ar.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_bg.txt b/resources/cache/empty/relation/conf/lang/stopwords_bg.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_bg.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_bg.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_ca.txt b/resources/cache/empty/relation/conf/lang/stopwords_ca.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_ca.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_ca.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_cz.txt b/resources/cache/empty/relation/conf/lang/stopwords_cz.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_cz.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_cz.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_da.txt b/resources/cache/empty/relation/conf/lang/stopwords_da.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_da.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_da.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_de.txt b/resources/cache/empty/relation/conf/lang/stopwords_de.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_de.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_de.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_el.txt b/resources/cache/empty/relation/conf/lang/stopwords_el.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_el.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_el.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_en.txt b/resources/cache/empty/relation/conf/lang/stopwords_en.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_en.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_en.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_es.txt b/resources/cache/empty/relation/conf/lang/stopwords_es.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_es.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_es.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_eu.txt b/resources/cache/empty/relation/conf/lang/stopwords_eu.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_eu.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_eu.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_fa.txt b/resources/cache/empty/relation/conf/lang/stopwords_fa.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_fa.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_fa.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_fi.txt b/resources/cache/empty/relation/conf/lang/stopwords_fi.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_fi.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_fi.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_fr.txt b/resources/cache/empty/relation/conf/lang/stopwords_fr.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_fr.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_fr.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_ga.txt b/resources/cache/empty/relation/conf/lang/stopwords_ga.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_ga.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_ga.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_gl.txt b/resources/cache/empty/relation/conf/lang/stopwords_gl.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_gl.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_gl.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_hi.txt b/resources/cache/empty/relation/conf/lang/stopwords_hi.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_hi.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_hi.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_hu.txt b/resources/cache/empty/relation/conf/lang/stopwords_hu.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_hu.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_hu.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_hy.txt b/resources/cache/empty/relation/conf/lang/stopwords_hy.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_hy.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_hy.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_id.txt b/resources/cache/empty/relation/conf/lang/stopwords_id.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_id.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_id.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_it.txt b/resources/cache/empty/relation/conf/lang/stopwords_it.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_it.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_it.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_ja.txt b/resources/cache/empty/relation/conf/lang/stopwords_ja.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_ja.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_ja.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_lv.txt b/resources/cache/empty/relation/conf/lang/stopwords_lv.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_lv.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_lv.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_nl.txt b/resources/cache/empty/relation/conf/lang/stopwords_nl.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_nl.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_nl.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_no.txt b/resources/cache/empty/relation/conf/lang/stopwords_no.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_no.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_no.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_pt.txt b/resources/cache/empty/relation/conf/lang/stopwords_pt.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_pt.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_pt.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_ro.txt b/resources/cache/empty/relation/conf/lang/stopwords_ro.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_ro.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_ro.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_ru.txt b/resources/cache/empty/relation/conf/lang/stopwords_ru.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_ru.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_ru.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_sv.txt b/resources/cache/empty/relation/conf/lang/stopwords_sv.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_sv.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_sv.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_th.txt b/resources/cache/empty/relation/conf/lang/stopwords_th.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_th.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_th.txt
diff --git a/cache/empty/relation/conf/lang/stopwords_tr.txt b/resources/cache/empty/relation/conf/lang/stopwords_tr.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/stopwords_tr.txt
rename to resources/cache/empty/relation/conf/lang/stopwords_tr.txt
diff --git a/cache/empty/relation/conf/lang/userdict_ja.txt b/resources/cache/empty/relation/conf/lang/userdict_ja.txt
similarity index 100%
rename from cache/empty/relation/conf/lang/userdict_ja.txt
rename to resources/cache/empty/relation/conf/lang/userdict_ja.txt
diff --git a/cache/empty/relation/conf/params.json b/resources/cache/empty/relation/conf/params.json
similarity index 100%
rename from cache/empty/relation/conf/params.json
rename to resources/cache/empty/relation/conf/params.json
diff --git a/cache/empty/relation/conf/protwords.txt b/resources/cache/empty/relation/conf/protwords.txt
similarity index 100%
rename from cache/empty/relation/conf/protwords.txt
rename to resources/cache/empty/relation/conf/protwords.txt
diff --git a/cache/empty/relation/conf/schema.xml b/resources/cache/empty/relation/conf/schema.xml
similarity index 100%
rename from cache/empty/relation/conf/schema.xml
rename to resources/cache/empty/relation/conf/schema.xml
diff --git a/cache/empty/relation/conf/solrconfig.xml b/resources/cache/empty/relation/conf/solrconfig.xml
similarity index 100%
rename from cache/empty/relation/conf/solrconfig.xml
rename to resources/cache/empty/relation/conf/solrconfig.xml
diff --git a/cache/empty/relation/conf/stopwords.txt b/resources/cache/empty/relation/conf/stopwords.txt
similarity index 100%
rename from cache/empty/relation/conf/stopwords.txt
rename to resources/cache/empty/relation/conf/stopwords.txt
diff --git a/cache/empty/relation/conf/synonyms.txt b/resources/cache/empty/relation/conf/synonyms.txt
similarity index 100%
rename from cache/empty/relation/conf/synonyms.txt
rename to resources/cache/empty/relation/conf/synonyms.txt
diff --git a/cache/empty/relation/core.properties b/resources/cache/empty/relation/core.properties
similarity index 100%
rename from cache/empty/relation/core.properties
rename to resources/cache/empty/relation/core.properties
diff --git a/resources/cache/empty/relation/data/index/segments_1 b/resources/cache/empty/relation/data/index/segments_1
new file mode 100644
index 00000000..7980050b
Binary files /dev/null and b/resources/cache/empty/relation/data/index/segments_1 differ
diff --git a/resources/cache/empty/relation/data/index/write.lock b/resources/cache/empty/relation/data/index/write.lock
new file mode 100644
index 00000000..e69de29b
diff --git a/cache/empty/similarity/conf/currency.xml b/resources/cache/empty/similarity/conf/currency.xml
similarity index 100%
rename from cache/empty/similarity/conf/currency.xml
rename to resources/cache/empty/similarity/conf/currency.xml
diff --git a/cache/empty/similarity/conf/elevate.xml b/resources/cache/empty/similarity/conf/elevate.xml
similarity index 100%
rename from cache/empty/similarity/conf/elevate.xml
rename to resources/cache/empty/similarity/conf/elevate.xml
diff --git a/cache/empty/similarity/conf/lang/contractions_ca.txt b/resources/cache/empty/similarity/conf/lang/contractions_ca.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/contractions_ca.txt
rename to resources/cache/empty/similarity/conf/lang/contractions_ca.txt
diff --git a/cache/empty/similarity/conf/lang/contractions_fr.txt b/resources/cache/empty/similarity/conf/lang/contractions_fr.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/contractions_fr.txt
rename to resources/cache/empty/similarity/conf/lang/contractions_fr.txt
diff --git a/cache/empty/similarity/conf/lang/contractions_ga.txt b/resources/cache/empty/similarity/conf/lang/contractions_ga.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/contractions_ga.txt
rename to resources/cache/empty/similarity/conf/lang/contractions_ga.txt
diff --git a/cache/empty/similarity/conf/lang/contractions_it.txt b/resources/cache/empty/similarity/conf/lang/contractions_it.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/contractions_it.txt
rename to resources/cache/empty/similarity/conf/lang/contractions_it.txt
diff --git a/cache/empty/similarity/conf/lang/hyphenations_ga.txt b/resources/cache/empty/similarity/conf/lang/hyphenations_ga.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/hyphenations_ga.txt
rename to resources/cache/empty/similarity/conf/lang/hyphenations_ga.txt
diff --git a/cache/empty/similarity/conf/lang/stemdict_nl.txt b/resources/cache/empty/similarity/conf/lang/stemdict_nl.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stemdict_nl.txt
rename to resources/cache/empty/similarity/conf/lang/stemdict_nl.txt
diff --git a/cache/empty/similarity/conf/lang/stoptags_ja.txt b/resources/cache/empty/similarity/conf/lang/stoptags_ja.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stoptags_ja.txt
rename to resources/cache/empty/similarity/conf/lang/stoptags_ja.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_ar.txt b/resources/cache/empty/similarity/conf/lang/stopwords_ar.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_ar.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_ar.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_bg.txt b/resources/cache/empty/similarity/conf/lang/stopwords_bg.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_bg.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_bg.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_ca.txt b/resources/cache/empty/similarity/conf/lang/stopwords_ca.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_ca.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_ca.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_cz.txt b/resources/cache/empty/similarity/conf/lang/stopwords_cz.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_cz.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_cz.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_da.txt b/resources/cache/empty/similarity/conf/lang/stopwords_da.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_da.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_da.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_de.txt b/resources/cache/empty/similarity/conf/lang/stopwords_de.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_de.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_de.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_el.txt b/resources/cache/empty/similarity/conf/lang/stopwords_el.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_el.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_el.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_en.txt b/resources/cache/empty/similarity/conf/lang/stopwords_en.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_en.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_en.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_es.txt b/resources/cache/empty/similarity/conf/lang/stopwords_es.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_es.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_es.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_eu.txt b/resources/cache/empty/similarity/conf/lang/stopwords_eu.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_eu.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_eu.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_fa.txt b/resources/cache/empty/similarity/conf/lang/stopwords_fa.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_fa.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_fa.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_fi.txt b/resources/cache/empty/similarity/conf/lang/stopwords_fi.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_fi.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_fi.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_fr.txt b/resources/cache/empty/similarity/conf/lang/stopwords_fr.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_fr.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_fr.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_ga.txt b/resources/cache/empty/similarity/conf/lang/stopwords_ga.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_ga.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_ga.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_gl.txt b/resources/cache/empty/similarity/conf/lang/stopwords_gl.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_gl.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_gl.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_hi.txt b/resources/cache/empty/similarity/conf/lang/stopwords_hi.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_hi.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_hi.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_hu.txt b/resources/cache/empty/similarity/conf/lang/stopwords_hu.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_hu.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_hu.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_hy.txt b/resources/cache/empty/similarity/conf/lang/stopwords_hy.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_hy.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_hy.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_id.txt b/resources/cache/empty/similarity/conf/lang/stopwords_id.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_id.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_id.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_it.txt b/resources/cache/empty/similarity/conf/lang/stopwords_it.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_it.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_it.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_ja.txt b/resources/cache/empty/similarity/conf/lang/stopwords_ja.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_ja.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_ja.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_lv.txt b/resources/cache/empty/similarity/conf/lang/stopwords_lv.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_lv.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_lv.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_nl.txt b/resources/cache/empty/similarity/conf/lang/stopwords_nl.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_nl.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_nl.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_no.txt b/resources/cache/empty/similarity/conf/lang/stopwords_no.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_no.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_no.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_pt.txt b/resources/cache/empty/similarity/conf/lang/stopwords_pt.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_pt.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_pt.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_ro.txt b/resources/cache/empty/similarity/conf/lang/stopwords_ro.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_ro.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_ro.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_ru.txt b/resources/cache/empty/similarity/conf/lang/stopwords_ru.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_ru.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_ru.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_sv.txt b/resources/cache/empty/similarity/conf/lang/stopwords_sv.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_sv.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_sv.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_th.txt b/resources/cache/empty/similarity/conf/lang/stopwords_th.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_th.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_th.txt
diff --git a/cache/empty/similarity/conf/lang/stopwords_tr.txt b/resources/cache/empty/similarity/conf/lang/stopwords_tr.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/stopwords_tr.txt
rename to resources/cache/empty/similarity/conf/lang/stopwords_tr.txt
diff --git a/cache/empty/similarity/conf/lang/userdict_ja.txt b/resources/cache/empty/similarity/conf/lang/userdict_ja.txt
similarity index 100%
rename from cache/empty/similarity/conf/lang/userdict_ja.txt
rename to resources/cache/empty/similarity/conf/lang/userdict_ja.txt
diff --git a/cache/empty/similarity/conf/params.json b/resources/cache/empty/similarity/conf/params.json
similarity index 100%
rename from cache/empty/similarity/conf/params.json
rename to resources/cache/empty/similarity/conf/params.json
diff --git a/cache/empty/similarity/conf/protwords.txt b/resources/cache/empty/similarity/conf/protwords.txt
similarity index 100%
rename from cache/empty/similarity/conf/protwords.txt
rename to resources/cache/empty/similarity/conf/protwords.txt
diff --git a/cache/empty/similarity/conf/schema.xml b/resources/cache/empty/similarity/conf/schema.xml
similarity index 100%
rename from cache/empty/similarity/conf/schema.xml
rename to resources/cache/empty/similarity/conf/schema.xml
diff --git a/cache/empty/similarity/conf/solrconfig.xml b/resources/cache/empty/similarity/conf/solrconfig.xml
similarity index 100%
rename from cache/empty/similarity/conf/solrconfig.xml
rename to resources/cache/empty/similarity/conf/solrconfig.xml
diff --git a/cache/empty/similarity/conf/stopwords.txt b/resources/cache/empty/similarity/conf/stopwords.txt
similarity index 100%
rename from cache/empty/similarity/conf/stopwords.txt
rename to resources/cache/empty/similarity/conf/stopwords.txt
diff --git a/cache/empty/similarity/conf/synonyms.txt b/resources/cache/empty/similarity/conf/synonyms.txt
similarity index 100%
rename from cache/empty/similarity/conf/synonyms.txt
rename to resources/cache/empty/similarity/conf/synonyms.txt
diff --git a/cache/empty/similarity/core.properties b/resources/cache/empty/similarity/core.properties
similarity index 100%
rename from cache/empty/similarity/core.properties
rename to resources/cache/empty/similarity/core.properties
diff --git a/resources/cache/empty/similarity/data/index/segments_1 b/resources/cache/empty/similarity/data/index/segments_1
new file mode 100644
index 00000000..e89a60b9
Binary files /dev/null and b/resources/cache/empty/similarity/data/index/segments_1 differ
diff --git a/resources/cache/empty/similarity/data/index/write.lock b/resources/cache/empty/similarity/data/index/write.lock
new file mode 100644
index 00000000..e69de29b
diff --git a/cache/empty/solr.xml b/resources/cache/empty/solr.xml
similarity index 100%
rename from cache/empty/solr.xml
rename to resources/cache/empty/solr.xml
diff --git a/cache/empty/websearch/conf/currency.xml b/resources/cache/empty/websearch/conf/currency.xml
similarity index 100%
rename from cache/empty/websearch/conf/currency.xml
rename to resources/cache/empty/websearch/conf/currency.xml
diff --git a/cache/empty/websearch/conf/elevate.xml b/resources/cache/empty/websearch/conf/elevate.xml
similarity index 100%
rename from cache/empty/websearch/conf/elevate.xml
rename to resources/cache/empty/websearch/conf/elevate.xml
diff --git a/cache/empty/websearch/conf/lang/contractions_ca.txt b/resources/cache/empty/websearch/conf/lang/contractions_ca.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/contractions_ca.txt
rename to resources/cache/empty/websearch/conf/lang/contractions_ca.txt
diff --git a/cache/empty/websearch/conf/lang/contractions_fr.txt b/resources/cache/empty/websearch/conf/lang/contractions_fr.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/contractions_fr.txt
rename to resources/cache/empty/websearch/conf/lang/contractions_fr.txt
diff --git a/cache/empty/websearch/conf/lang/contractions_ga.txt b/resources/cache/empty/websearch/conf/lang/contractions_ga.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/contractions_ga.txt
rename to resources/cache/empty/websearch/conf/lang/contractions_ga.txt
diff --git a/cache/empty/websearch/conf/lang/contractions_it.txt b/resources/cache/empty/websearch/conf/lang/contractions_it.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/contractions_it.txt
rename to resources/cache/empty/websearch/conf/lang/contractions_it.txt
diff --git a/cache/empty/websearch/conf/lang/hyphenations_ga.txt b/resources/cache/empty/websearch/conf/lang/hyphenations_ga.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/hyphenations_ga.txt
rename to resources/cache/empty/websearch/conf/lang/hyphenations_ga.txt
diff --git a/cache/empty/websearch/conf/lang/stemdict_nl.txt b/resources/cache/empty/websearch/conf/lang/stemdict_nl.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stemdict_nl.txt
rename to resources/cache/empty/websearch/conf/lang/stemdict_nl.txt
diff --git a/cache/empty/websearch/conf/lang/stoptags_ja.txt b/resources/cache/empty/websearch/conf/lang/stoptags_ja.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stoptags_ja.txt
rename to resources/cache/empty/websearch/conf/lang/stoptags_ja.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_ar.txt b/resources/cache/empty/websearch/conf/lang/stopwords_ar.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_ar.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_ar.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_bg.txt b/resources/cache/empty/websearch/conf/lang/stopwords_bg.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_bg.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_bg.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_ca.txt b/resources/cache/empty/websearch/conf/lang/stopwords_ca.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_ca.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_ca.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_cz.txt b/resources/cache/empty/websearch/conf/lang/stopwords_cz.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_cz.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_cz.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_da.txt b/resources/cache/empty/websearch/conf/lang/stopwords_da.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_da.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_da.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_de.txt b/resources/cache/empty/websearch/conf/lang/stopwords_de.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_de.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_de.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_el.txt b/resources/cache/empty/websearch/conf/lang/stopwords_el.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_el.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_el.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_en.txt b/resources/cache/empty/websearch/conf/lang/stopwords_en.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_en.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_en.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_es.txt b/resources/cache/empty/websearch/conf/lang/stopwords_es.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_es.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_es.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_eu.txt b/resources/cache/empty/websearch/conf/lang/stopwords_eu.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_eu.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_eu.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_fa.txt b/resources/cache/empty/websearch/conf/lang/stopwords_fa.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_fa.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_fa.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_fi.txt b/resources/cache/empty/websearch/conf/lang/stopwords_fi.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_fi.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_fi.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_fr.txt b/resources/cache/empty/websearch/conf/lang/stopwords_fr.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_fr.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_fr.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_ga.txt b/resources/cache/empty/websearch/conf/lang/stopwords_ga.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_ga.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_ga.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_gl.txt b/resources/cache/empty/websearch/conf/lang/stopwords_gl.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_gl.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_gl.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_hi.txt b/resources/cache/empty/websearch/conf/lang/stopwords_hi.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_hi.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_hi.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_hu.txt b/resources/cache/empty/websearch/conf/lang/stopwords_hu.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_hu.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_hu.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_hy.txt b/resources/cache/empty/websearch/conf/lang/stopwords_hy.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_hy.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_hy.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_id.txt b/resources/cache/empty/websearch/conf/lang/stopwords_id.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_id.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_id.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_it.txt b/resources/cache/empty/websearch/conf/lang/stopwords_it.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_it.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_it.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_ja.txt b/resources/cache/empty/websearch/conf/lang/stopwords_ja.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_ja.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_ja.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_lv.txt b/resources/cache/empty/websearch/conf/lang/stopwords_lv.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_lv.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_lv.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_nl.txt b/resources/cache/empty/websearch/conf/lang/stopwords_nl.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_nl.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_nl.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_no.txt b/resources/cache/empty/websearch/conf/lang/stopwords_no.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_no.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_no.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_pt.txt b/resources/cache/empty/websearch/conf/lang/stopwords_pt.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_pt.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_pt.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_ro.txt b/resources/cache/empty/websearch/conf/lang/stopwords_ro.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_ro.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_ro.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_ru.txt b/resources/cache/empty/websearch/conf/lang/stopwords_ru.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_ru.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_ru.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_sv.txt b/resources/cache/empty/websearch/conf/lang/stopwords_sv.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_sv.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_sv.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_th.txt b/resources/cache/empty/websearch/conf/lang/stopwords_th.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_th.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_th.txt
diff --git a/cache/empty/websearch/conf/lang/stopwords_tr.txt b/resources/cache/empty/websearch/conf/lang/stopwords_tr.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/stopwords_tr.txt
rename to resources/cache/empty/websearch/conf/lang/stopwords_tr.txt
diff --git a/cache/empty/websearch/conf/lang/userdict_ja.txt b/resources/cache/empty/websearch/conf/lang/userdict_ja.txt
similarity index 100%
rename from cache/empty/websearch/conf/lang/userdict_ja.txt
rename to resources/cache/empty/websearch/conf/lang/userdict_ja.txt
diff --git a/cache/empty/websearch/conf/params.json b/resources/cache/empty/websearch/conf/params.json
similarity index 100%
rename from cache/empty/websearch/conf/params.json
rename to resources/cache/empty/websearch/conf/params.json
diff --git a/cache/empty/websearch/conf/protwords.txt b/resources/cache/empty/websearch/conf/protwords.txt
similarity index 100%
rename from cache/empty/websearch/conf/protwords.txt
rename to resources/cache/empty/websearch/conf/protwords.txt
diff --git a/cache/empty/websearch/conf/schema.xml b/resources/cache/empty/websearch/conf/schema.xml
similarity index 100%
rename from cache/empty/websearch/conf/schema.xml
rename to resources/cache/empty/websearch/conf/schema.xml
diff --git a/cache/empty/websearch/conf/solrconfig.xml b/resources/cache/empty/websearch/conf/solrconfig.xml
similarity index 100%
rename from cache/empty/websearch/conf/solrconfig.xml
rename to resources/cache/empty/websearch/conf/solrconfig.xml
diff --git a/cache/empty/websearch/conf/stopwords.txt b/resources/cache/empty/websearch/conf/stopwords.txt
similarity index 100%
rename from cache/empty/websearch/conf/stopwords.txt
rename to resources/cache/empty/websearch/conf/stopwords.txt
diff --git a/cache/empty/websearch/conf/synonyms.txt b/resources/cache/empty/websearch/conf/synonyms.txt
similarity index 100%
rename from cache/empty/websearch/conf/synonyms.txt
rename to resources/cache/empty/websearch/conf/synonyms.txt
diff --git a/cache/empty/websearch/core.properties b/resources/cache/empty/websearch/core.properties
similarity index 100%
rename from cache/empty/websearch/core.properties
rename to resources/cache/empty/websearch/core.properties
diff --git a/resources/cache/empty/websearch/data/index/_k.fdt b/resources/cache/empty/websearch/data/index/_k.fdt
new file mode 100644
index 00000000..63ee270c
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_k.fdt differ
diff --git a/resources/cache/empty/websearch/data/index/_k.fdx b/resources/cache/empty/websearch/data/index/_k.fdx
new file mode 100644
index 00000000..a139aced
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_k.fdx differ
diff --git a/resources/cache/empty/websearch/data/index/_k.fnm b/resources/cache/empty/websearch/data/index/_k.fnm
new file mode 100644
index 00000000..d6d139bf
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_k.fnm differ
diff --git a/resources/cache/empty/websearch/data/index/_k.nvd b/resources/cache/empty/websearch/data/index/_k.nvd
new file mode 100644
index 00000000..ff3e32a1
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_k.nvd differ
diff --git a/resources/cache/empty/websearch/data/index/_k.nvm b/resources/cache/empty/websearch/data/index/_k.nvm
new file mode 100644
index 00000000..7fe1734e
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_k.nvm differ
diff --git a/resources/cache/empty/websearch/data/index/_k.si b/resources/cache/empty/websearch/data/index/_k.si
new file mode 100644
index 00000000..66ddd65b
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_k.si differ
diff --git a/resources/cache/empty/websearch/data/index/_k_Lucene50_0.doc b/resources/cache/empty/websearch/data/index/_k_Lucene50_0.doc
new file mode 100644
index 00000000..b0d33ad5
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_k_Lucene50_0.doc differ
diff --git a/resources/cache/empty/websearch/data/index/_k_Lucene50_0.pos b/resources/cache/empty/websearch/data/index/_k_Lucene50_0.pos
new file mode 100644
index 00000000..0fd15669
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_k_Lucene50_0.pos differ
diff --git a/resources/cache/empty/websearch/data/index/_k_Lucene50_0.tim b/resources/cache/empty/websearch/data/index/_k_Lucene50_0.tim
new file mode 100644
index 00000000..10578142
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_k_Lucene50_0.tim differ
diff --git a/resources/cache/empty/websearch/data/index/_k_Lucene50_0.tip b/resources/cache/empty/websearch/data/index/_k_Lucene50_0.tip
new file mode 100644
index 00000000..2dcc2fe4
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_k_Lucene50_0.tip differ
diff --git a/resources/cache/empty/websearch/data/index/_l.fdt b/resources/cache/empty/websearch/data/index/_l.fdt
new file mode 100644
index 00000000..1f29f819
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_l.fdt differ
diff --git a/resources/cache/empty/websearch/data/index/_l.fdx b/resources/cache/empty/websearch/data/index/_l.fdx
new file mode 100644
index 00000000..c46088d0
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_l.fdx differ
diff --git a/resources/cache/empty/websearch/data/index/_l.fnm b/resources/cache/empty/websearch/data/index/_l.fnm
new file mode 100644
index 00000000..e86b75d1
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_l.fnm differ
diff --git a/resources/cache/empty/websearch/data/index/_l.nvd b/resources/cache/empty/websearch/data/index/_l.nvd
new file mode 100644
index 00000000..3905244b
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_l.nvd differ
diff --git a/resources/cache/empty/websearch/data/index/_l.nvm b/resources/cache/empty/websearch/data/index/_l.nvm
new file mode 100644
index 00000000..cf08f312
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_l.nvm differ
diff --git a/resources/cache/empty/websearch/data/index/_l.si b/resources/cache/empty/websearch/data/index/_l.si
new file mode 100644
index 00000000..e7007e23
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_l.si differ
diff --git a/resources/cache/empty/websearch/data/index/_l_Lucene50_0.doc b/resources/cache/empty/websearch/data/index/_l_Lucene50_0.doc
new file mode 100644
index 00000000..b787920d
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_l_Lucene50_0.doc differ
diff --git a/resources/cache/empty/websearch/data/index/_l_Lucene50_0.pos b/resources/cache/empty/websearch/data/index/_l_Lucene50_0.pos
new file mode 100644
index 00000000..58b07a1a
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_l_Lucene50_0.pos differ
diff --git a/resources/cache/empty/websearch/data/index/_l_Lucene50_0.tim b/resources/cache/empty/websearch/data/index/_l_Lucene50_0.tim
new file mode 100644
index 00000000..8102cff3
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_l_Lucene50_0.tim differ
diff --git a/resources/cache/empty/websearch/data/index/_l_Lucene50_0.tip b/resources/cache/empty/websearch/data/index/_l_Lucene50_0.tip
new file mode 100644
index 00000000..28c5d63c
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/_l_Lucene50_0.tip differ
diff --git a/resources/cache/empty/websearch/data/index/segments_m b/resources/cache/empty/websearch/data/index/segments_m
new file mode 100644
index 00000000..ffd83a0b
Binary files /dev/null and b/resources/cache/empty/websearch/data/index/segments_m differ
diff --git a/resources/cache/empty/websearch/data/index/write.lock b/resources/cache/empty/websearch/data/index/write.lock
new file mode 100644
index 00000000..e69de29b
diff --git a/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000010 b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000010
new file mode 100644
index 00000000..51d3e07b
Binary files /dev/null and b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000010 differ
diff --git a/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000011 b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000011
new file mode 100644
index 00000000..0718521b
Binary files /dev/null and b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000011 differ
diff --git a/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000012 b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000012
new file mode 100644
index 00000000..56b7f8a9
Binary files /dev/null and b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000012 differ
diff --git a/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000013 b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000013
new file mode 100644
index 00000000..c2cf4874
Binary files /dev/null and b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000013 differ
diff --git a/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000014 b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000014
new file mode 100644
index 00000000..18ff6d6e
Binary files /dev/null and b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000014 differ
diff --git a/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000015 b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000015
new file mode 100644
index 00000000..47b6f02f
Binary files /dev/null and b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000015 differ
diff --git a/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000016 b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000016
new file mode 100644
index 00000000..518a3363
Binary files /dev/null and b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000016 differ
diff --git a/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000017 b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000017
new file mode 100644
index 00000000..abddafe3
Binary files /dev/null and b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000017 differ
diff --git a/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000018 b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000018
new file mode 100644
index 00000000..1183a347
Binary files /dev/null and b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000018 differ
diff --git a/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000019 b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000019
new file mode 100644
index 00000000..7b4e187d
Binary files /dev/null and b/resources/cache/empty/websearch/data/tlog/tlog.0000000000000000019 differ
diff --git a/cache/readme.txt b/resources/cache/readme.txt
similarity index 100%
rename from cache/readme.txt
rename to resources/cache/readme.txt
diff --git a/cache_dbpedia_oak.zip b/resources/cache_dbpedia_oak.zip
similarity index 100%
rename from cache_dbpedia_oak.zip
rename to resources/cache_dbpedia_oak.zip
diff --git a/cache_freebase.zip b/resources/cache_freebase.zip
similarity index 100%
rename from cache_freebase.zip
rename to resources/cache_freebase.zip
diff --git a/sti-any23/pom.xml b/sti-any23/pom.xml
new file mode 100644
index 00000000..6899a6a3
--- /dev/null
+++ b/sti-any23/pom.xml
@@ -0,0 +1,45 @@
+
+ 4.0.0
+ uk.ac.shef.dcs
+ sti-any23
+ 1.0
+
+
+
+ org.apache.any23
+ apache-any23-core
+ 0.7.0-incubating
+
+
+ org.slf4j
+ slf4j-api
+
+
+ org.slf4j
+ slf4j-jdk14
+
+
+ org.slf4j
+ jcl-over-slf4j
+
+
+
+
+
+
+
+ src
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 2.3.2
+
+ 1.8
+ 1.8
+
+
+
+
+
\ No newline at end of file
diff --git a/any23-sti/src/org/apache/any23/extractor/LExtractionResultImpl.java b/sti-any23/src/org/apache/any23/extractor/LExtractionResultImpl.java
similarity index 100%
rename from any23-sti/src/org/apache/any23/extractor/LExtractionResultImpl.java
rename to sti-any23/src/org/apache/any23/extractor/LExtractionResultImpl.java
diff --git a/any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LAny23.java b/sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LAny23.java
similarity index 100%
rename from any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LAny23.java
rename to sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LAny23.java
diff --git a/any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LAny23Util.java b/sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LAny23Util.java
similarity index 100%
rename from any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LAny23Util.java
rename to sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LAny23Util.java
diff --git a/any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LExtractorRegistry.java b/sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LExtractorRegistry.java
similarity index 100%
rename from any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LExtractorRegistry.java
rename to sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LExtractorRegistry.java
diff --git a/any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LMicrodataExtractor.java b/sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LMicrodataExtractor.java
similarity index 100%
rename from any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LMicrodataExtractor.java
rename to sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LMicrodataExtractor.java
diff --git a/any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LMicrodataParser.java b/sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LMicrodataParser.java
similarity index 100%
rename from any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LMicrodataParser.java
rename to sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LMicrodataParser.java
diff --git a/any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LNTripleWriter.java b/sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LNTripleWriter.java
similarity index 100%
rename from any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LNTripleWriter.java
rename to sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LNTripleWriter.java
diff --git a/any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LRDFa11Extractor.java b/sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LRDFa11Extractor.java
similarity index 100%
rename from any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LRDFa11Extractor.java
rename to sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LRDFa11Extractor.java
diff --git a/any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LRDFa11Parser.java b/sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LRDFa11Parser.java
similarity index 100%
rename from any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LRDFa11Parser.java
rename to sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LRDFa11Parser.java
diff --git a/any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LSingleDocumentExtraction.java b/sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LSingleDocumentExtraction.java
similarity index 100%
rename from any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LSingleDocumentExtraction.java
rename to sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LSingleDocumentExtraction.java
diff --git a/any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LTriple.java b/sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LTriple.java
similarity index 100%
rename from any23-sti/src/uk/ac/shef/oak/any23/extension/extractor/LTriple.java
rename to sti-any23/src/uk/ac/shef/oak/any23/extension/extractor/LTriple.java
diff --git a/common-util/pom.xml b/sti-common-util/pom.xml
similarity index 94%
rename from common-util/pom.xml
rename to sti-common-util/pom.xml
index 0eaa54e3..016a2d20 100644
--- a/common-util/pom.xml
+++ b/sti-common-util/pom.xml
@@ -5,7 +5,7 @@
4.0.0
uk.ac.shef.dcs
- common-util
+ sti-common-util
1.0
@@ -52,16 +52,17 @@
UTF-8
+
+ src
- true
org.apache.maven.plugins
maven-compiler-plugin
+ 2.3.2
1.8
1.8
- UTF-8
diff --git a/common-util/src/main/java/uk/ac/shef/dcs/util/SerializationUtils.java b/sti-common-util/src/main/java/uk/ac/shef/dcs/util/SerializationUtils.java
similarity index 100%
rename from common-util/src/main/java/uk/ac/shef/dcs/util/SerializationUtils.java
rename to sti-common-util/src/main/java/uk/ac/shef/dcs/util/SerializationUtils.java
diff --git a/common-util/src/main/java/uk/ac/shef/dcs/util/SolrCache.java b/sti-common-util/src/main/java/uk/ac/shef/dcs/util/SolrCache.java
similarity index 100%
rename from common-util/src/main/java/uk/ac/shef/dcs/util/SolrCache.java
rename to sti-common-util/src/main/java/uk/ac/shef/dcs/util/SolrCache.java
diff --git a/common-util/src/main/java/uk/ac/shef/dcs/util/StringUtils.java b/sti-common-util/src/main/java/uk/ac/shef/dcs/util/StringUtils.java
similarity index 98%
rename from common-util/src/main/java/uk/ac/shef/dcs/util/StringUtils.java
rename to sti-common-util/src/main/java/uk/ac/shef/dcs/util/StringUtils.java
index 973fc7d3..42c6e13c 100644
--- a/common-util/src/main/java/uk/ac/shef/dcs/util/StringUtils.java
+++ b/sti-common-util/src/main/java/uk/ac/shef/dcs/util/StringUtils.java
@@ -1,7 +1,5 @@
package uk.ac.shef.dcs.util;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
diff --git a/kbsearch/pom.xml b/sti-kbsearch/pom.xml
similarity index 92%
rename from kbsearch/pom.xml
rename to sti-kbsearch/pom.xml
index e507f365..03ba191a 100644
--- a/kbsearch/pom.xml
+++ b/sti-kbsearch/pom.xml
@@ -6,19 +6,20 @@
uk.ac.shef.dcs
- kbsearch
+ sti-kbsearch
1.0
jar
- kbsearch
log4j
log4j
1.2.17
- uk.ac.shef.dcs
- common-util
- 1.0
+
+ uk.ac.shef.dcs
+ sti-common-util
+ 1.0
+
org.apache.commons
commons-lang3
@@ -95,16 +96,17 @@
+
+ src
- true
org.apache.maven.plugins
maven-compiler-plugin
+ 2.3.2
1.8
1.8
- UTF-8
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/KBSearch.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/KBSearch.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/KBSearch.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/KBSearch.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/KBSearchException.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/KBSearchException.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/KBSearchException.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/KBSearchException.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/KBSearchFactory.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/KBSearchFactory.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/KBSearchFactory.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/KBSearchFactory.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/KBSearchResultFilter.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/KBSearchResultFilter.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/KBSearchResultFilter.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/KBSearchResultFilter.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseAttribute.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseAttribute.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseAttribute.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseAttribute.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseEnum.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseEnum.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseEnum.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseEnum.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseQueryInterrupter.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseQueryInterrupter.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseQueryInterrupter.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseQueryInterrupter.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseQueryProxy.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseQueryProxy.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseQueryProxy.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseQueryProxy.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseSearch.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseSearch.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseSearch.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseSearch.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseSearchResultFilter.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseSearchResultFilter.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseSearchResultFilter.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseSearchResultFilter.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseTopic.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseTopic.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseTopic.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/freebase/FreebaseTopic.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/model/Attribute.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/model/Attribute.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/model/Attribute.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/model/Attribute.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/model/Clazz.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/model/Clazz.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/model/Clazz.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/model/Clazz.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/model/Entity.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/model/Entity.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/model/Entity.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/model/Entity.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/model/Resource.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/model/Resource.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/model/Resource.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/model/Resource.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DBpediaAttribute.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DBpediaAttribute.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DBpediaAttribute.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DBpediaAttribute.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DBpediaEnum.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DBpediaEnum.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DBpediaEnum.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DBpediaEnum.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DBpediaSearch.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DBpediaSearch.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DBpediaSearch.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DBpediaSearch.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DBpediaSearchResultFilter.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DBpediaSearchResultFilter.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DBpediaSearchResultFilter.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DBpediaSearchResultFilter.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DCEnum.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DCEnum.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DCEnum.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/DCEnum.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/FOAFEnum.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/FOAFEnum.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/FOAFEnum.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/FOAFEnum.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/RDFEnum.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/RDFEnum.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/RDFEnum.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/RDFEnum.java
diff --git a/kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/SPARQLSearch.java b/sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/SPARQLSearch.java
similarity index 100%
rename from kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/SPARQLSearch.java
rename to sti-kbsearch/src/main/java/uk/ac/shef/dcs/kbsearch/sparql/SPARQLSearch.java
diff --git a/core/pom.xml b/sti-main/pom.xml
similarity index 62%
rename from core/pom.xml
rename to sti-main/pom.xml
index 7b9eb753..1eab6e31 100644
--- a/core/pom.xml
+++ b/sti-main/pom.xml
@@ -5,20 +5,9 @@
4.0.0
uk.ac.shef.dcs
- sti
+ sti-main
1.0alpha
-
- UTF-8
- UTF-8
-
-
-
- Apache 2.0
- http://www.apache.org/licenses/LICENSE-2.0
-
-
-
com.google.code.gson
@@ -41,13 +30,22 @@
uk.ac.shef.dcs
- websearch
+ sti-websearch
+ 1.0
+
+
+ uk.ac.shef.dcs
+ sti-common-util
1.0
-
uk.ac.shef.dcs
- kbsearch
+ sti-kbsearch
+ 1.0
+
+
+ uk.ac.shef.dcs
+ sti-any23
1.0
@@ -56,9 +54,9 @@
1.6.0
- nlp.dragontools
- dragontools
- 1.0
+ edu.drexel
+ dragontool
+ 1.3.3
org.jsoup
@@ -66,21 +64,6 @@
1.6.3
-
- uk.ac.shef.dcs
- any23-sti
- 1.0
-
-
- uk.ac.shef.dcs
- common-util
- 1.0
-
-
cc.mallet
mallet
@@ -203,19 +186,6 @@
commons-email
1.4
-
-
-
-
@@ -241,105 +211,18 @@
-
-
-
- ossrh
- https://oss.sonatype.org/content/repositories/snapshots
-
-
- ossrh
- https://oss.sonatype.org/service/local/staging/deploy/maven2/
-
-
- install
+ src
-
- maven-antrun-plugin
-
-
- install
-
-
-
-
-
-
-
- run
-
-
-
-
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.3
- true
-
- ossrh
- https://oss.sonatype.org/
- true
-
-
- org.apache.maven.plugins
- maven-source-plugin
-
-
- attach-sources
- verify
-
- jar
-
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
-
-
-
-
-
- true
org.apache.maven.plugins
maven-compiler-plugin
+ 2.3.2
1.8
1.8
- UTF-8
-
-
- maven-assembly-plugin
- 2.2.1
-
-
- jar-with-dependencies
-
-
-
-
- make-assembly
-
- package
-
-
- single
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/core/src/main/java/log4j.properties b/sti-main/src/main/java/log4j.properties
similarity index 100%
rename from core/src/main/java/log4j.properties
rename to sti-main/src/main/java/log4j.properties
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/STIConstantProperty.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/STIConstantProperty.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/STIConstantProperty.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/STIConstantProperty.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/STIEnum.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/STIEnum.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/STIEnum.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/STIEnum.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/STIException.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/STIException.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/STIException.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/STIException.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/FreebaseTypeGranularityPopulator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/FreebaseTypeGranularityPopulator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/FreebaseTypeGranularityPopulator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/FreebaseTypeGranularityPopulator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/TAnnotationKeyFileReader.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/TAnnotationKeyFileReader.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/TAnnotationKeyFileReader.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/TAnnotationKeyFileReader.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/TestGRMM.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/TestGRMM.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/TestGRMM.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/TestGRMM.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/TestSubjectColumnDetector.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/TestSubjectColumnDetector.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/TestSubjectColumnDetector.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/TestSubjectColumnDetector.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/DataStats.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/DataStats.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/DataStats.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/DataStats.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/DataStats_TableSize_NameLength_Analysis_LimayeNew.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/DataStats_TableSize_NameLength_Analysis_LimayeNew.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/DataStats_TableSize_NameLength_Analysis_LimayeNew.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/DataStats_TableSize_NameLength_Analysis_LimayeNew.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/DataStats_TableSize_NameLength_Analysis_MB_IMDB.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/DataStats_TableSize_NameLength_Analysis_MB_IMDB.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/DataStats_TableSize_NameLength_Analysis_MB_IMDB.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/DataStats_TableSize_NameLength_Analysis_MB_IMDB.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/DataStats_TableSize_NameLength_Anaylsis_LimayeOld.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/DataStats_TableSize_NameLength_Anaylsis_LimayeOld.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/DataStats_TableSize_NameLength_Anaylsis_LimayeOld.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/DataStats_TableSize_NameLength_Anaylsis_LimayeOld.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_AllInOne_IMDB.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_AllInOne_IMDB.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_AllInOne_IMDB.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_AllInOne_IMDB.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_AllInOne_Limaye.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_AllInOne_Limaye.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_AllInOne_Limaye.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_AllInOne_Limaye.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_AllInOne_MB.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_AllInOne_MB.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_AllInOne_MB.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_AllInOne_MB.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_ClassOnly.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_ClassOnly.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_ClassOnly.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_ClassOnly.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_ClassOnly_IMDB_MusicBrainz.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_ClassOnly_IMDB_MusicBrainz.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_ClassOnly_IMDB_MusicBrainz.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_ClassOnly_IMDB_MusicBrainz.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_EntityOnly.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_EntityOnly.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_EntityOnly.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_EntityOnly.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_Generic_Classification_ignoreUpdateIterations.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_Generic_Classification_ignoreUpdateIterations.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_Generic_Classification_ignoreUpdateIterations.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_Generic_Classification_ignoreUpdateIterations.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_ISWC_Helper_ClassOnly.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_ISWC_Helper_ClassOnly.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_ISWC_Helper_ClassOnly.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_ISWC_Helper_ClassOnly.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_Limaye_Entity_Only.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_Limaye_Entity_Only.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_Limaye_Entity_Only.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_Limaye_Entity_Only.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_RelationOnly.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_RelationOnly.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_RelationOnly.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_RelationOnly.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_RelationOnly_IMDB_MusicBrainz.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_RelationOnly_IMDB_MusicBrainz.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/Evaluator_RelationOnly_IMDB_MusicBrainz.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/Evaluator_RelationOnly_IMDB_MusicBrainz.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/KeyFileGenerator_from_HTMLOutput.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/KeyFileGenerator_from_HTMLOutput.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/KeyFileGenerator_from_HTMLOutput.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/KeyFileGenerator_from_HTMLOutput.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/LimayeDataset_Entity_Discrepancy_Analysis_Generic.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/LimayeDataset_Entity_Discrepancy_Analysis_Generic.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/LimayeDataset_Entity_Discrepancy_Analysis_Generic.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/LimayeDataset_Entity_Discrepancy_Analysis_Generic.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/LimayeDataset_Entity_Discrepancy_btw_Baseline_Tm_Finder.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/LimayeDataset_Entity_Discrepancy_btw_Baseline_Tm_Finder.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/evaluation/LimayeDataset_Entity_Discrepancy_btw_Baseline_Tm_Finder.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/evaluation/LimayeDataset_Entity_Discrepancy_btw_Baseline_Tm_Finder.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/GSBuilder_IMDB.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/GSBuilder_IMDB.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/GSBuilder_IMDB.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/GSBuilder_IMDB.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/GSBuilder_Limaye.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/GSBuilder_Limaye.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/GSBuilder_Limaye.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/GSBuilder_Limaye.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/GSBuilder_Limaye_Wikitables.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/GSBuilder_Limaye_Wikitables.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/GSBuilder_Limaye_Wikitables.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/GSBuilder_Limaye_Wikitables.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/GSBuilder_Limaye_Wikitables_consolidate.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/GSBuilder_Limaye_Wikitables_consolidate.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/GSBuilder_Limaye_Wikitables_consolidate.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/GSBuilder_Limaye_Wikitables_consolidate.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/GSBuilder_Limaye_Wikitables_with_Ref.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/GSBuilder_Limaye_Wikitables_with_Ref.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/GSBuilder_Limaye_Wikitables_with_Ref.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/GSBuilder_Limaye_Wikitables_with_Ref.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/GSBuilder_MusicBrainz.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/GSBuilder_MusicBrainz.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/GSBuilder_MusicBrainz.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/GSBuilder_MusicBrainz.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/GSFile_Rewriter.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/GSFile_Rewriter.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/GSFile_Rewriter.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/GSFile_Rewriter.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/GS_Class_Relation_Consolidation_Helper.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/GS_Class_Relation_Consolidation_Helper.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/GS_Class_Relation_Consolidation_Helper.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/GS_Class_Relation_Consolidation_Helper.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/GS_Stats_Limaye.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/GS_Stats_Limaye.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/GS_Stats_Limaye.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/GS_Stats_Limaye.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/WikipediaTL_GSCreator_Pass1.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/WikipediaTL_GSCreator_Pass1.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/WikipediaTL_GSCreator_Pass1.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/WikipediaTL_GSCreator_Pass1.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/WikipediaTL_GSCreator_Pass2.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/WikipediaTL_GSCreator_Pass2.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/WikipediaTL_GSCreator_Pass2.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/WikipediaTL_GSCreator_Pass2.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/WikipediaTableListPageFilter.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/WikipediaTableListPageFilter.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/todo/gs/WikipediaTableListPageFilter.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/TODO/gs/WikipediaTableListPageFilter.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/any23/Any23Xtractor.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/any23/Any23Xtractor.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/any23/Any23Xtractor.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/any23/Any23Xtractor.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/SemanticTableInterpreter.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/SemanticTableInterpreter.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/SemanticTableInterpreter.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/SemanticTableInterpreter.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/BaselineInterpreter.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/BaselineInterpreter.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/BaselineInterpreter.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/BaselineInterpreter.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/BaselineRelationScorer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/BaselineRelationScorer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/BaselineRelationScorer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/BaselineRelationScorer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/BaselineSimilarityClazzScorer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/BaselineSimilarityClazzScorer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/BaselineSimilarityClazzScorer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/BaselineSimilarityClazzScorer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/BaselineSimilarityEntityScorer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/BaselineSimilarityEntityScorer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/BaselineSimilarityEntityScorer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/BaselineSimilarityEntityScorer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TCellDisambiguator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TCellDisambiguator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TCellDisambiguator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TCellDisambiguator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TCellDisambiguatorNameMatch.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TCellDisambiguatorNameMatch.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TCellDisambiguatorNameMatch.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TCellDisambiguatorNameMatch.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TCellDisambiguatorSimilarity.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TCellDisambiguatorSimilarity.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TCellDisambiguatorSimilarity.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TCellDisambiguatorSimilarity.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TColumnClassifier.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TColumnClassifier.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TColumnClassifier.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TColumnClassifier.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TColumnClassifierNameMatch.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TColumnClassifierNameMatch.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TColumnClassifierNameMatch.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TColumnClassifierNameMatch.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TColumnClassifierSimilarity.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TColumnClassifierSimilarity.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TColumnClassifierSimilarity.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/baseline/TColumnClassifierSimilarity.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/CandidateConceptGenerator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/CandidateConceptGenerator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/CandidateConceptGenerator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/CandidateConceptGenerator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/CandidateEntityGenerator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/CandidateEntityGenerator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/CandidateEntityGenerator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/CandidateEntityGenerator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/CandidateRelationGenerator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/CandidateRelationGenerator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/CandidateRelationGenerator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/CandidateRelationGenerator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/DebuggingUtil.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/DebuggingUtil.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/DebuggingUtil.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/DebuggingUtil.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/JIAdaptedAttributeMatcher.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/JIAdaptedAttributeMatcher.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/JIAdaptedAttributeMatcher.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/JIAdaptedAttributeMatcher.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/JIAdaptedEntityScorer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/JIAdaptedEntityScorer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/JIAdaptedEntityScorer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/JIAdaptedEntityScorer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/JIClazzScorer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/JIClazzScorer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/JIClazzScorer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/JIClazzScorer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/JIInterpreter.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/JIInterpreter.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/JIInterpreter.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/JIInterpreter.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/TAnnotationJI.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/TAnnotationJI.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/TAnnotationJI.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/TAnnotationJI.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/VariableType.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/VariableType.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/VariableType.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/VariableType.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilder.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilder.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilder.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilder.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderCell.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderCell.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderCell.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderCell.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderCellAndRelation.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderCellAndRelation.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderCellAndRelation.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderCellAndRelation.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderHeader.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderHeader.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderHeader.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderHeader.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderHeaderAndCell.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderHeaderAndCell.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderHeaderAndCell.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderHeaderAndCell.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderHeaderAndRelation.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderHeaderAndRelation.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderHeaderAndRelation.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorBuilderHeaderAndRelation.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorGraphBuilder.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorGraphBuilder.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorGraphBuilder.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/factorgraph/FactorGraphBuilder.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/similarity/EntityAndClazzSimilarityScorer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/similarity/EntityAndClazzSimilarityScorer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/similarity/EntityAndClazzSimilarityScorer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/similarity/EntityAndClazzSimilarityScorer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/similarity/SimilarityComputerManager.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/similarity/SimilarityComputerManager.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/similarity/SimilarityComputerManager.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/similarity/SimilarityComputerManager.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/similarity/SimilarityComputerThread.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/similarity/SimilarityComputerThread.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/similarity/SimilarityComputerThread.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/ji/similarity/SimilarityComputerThread.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/CellAnnotationUpdater.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/CellAnnotationUpdater.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/CellAnnotationUpdater.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/CellAnnotationUpdater.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/ChangeMessage.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/ChangeMessage.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/ChangeMessage.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/ChangeMessage.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/ChangeMessageComputer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/ChangeMessageComputer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/ChangeMessageComputer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/ChangeMessageComputer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/ChangeMessageFromRelation.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/ChangeMessageFromRelation.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/ChangeMessageFromRelation.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/ChangeMessageFromRelation.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/ClazzSpecificityCalculator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/ClazzSpecificityCalculator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/ClazzSpecificityCalculator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/ClazzSpecificityCalculator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/FreebaseClazzSpecificityCalculator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/FreebaseClazzSpecificityCalculator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/FreebaseClazzSpecificityCalculator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/FreebaseClazzSpecificityCalculator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/SMPAdaptedEntityScorer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/SMPAdaptedEntityScorer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/SMPAdaptedEntityScorer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/SMPAdaptedEntityScorer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/SMPInterpreter.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/SMPInterpreter.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/SMPInterpreter.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/SMPInterpreter.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/SemanticMessagePassing.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/SemanticMessagePassing.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/SemanticMessagePassing.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/SemanticMessagePassing.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TAnnotationSMPFreebase.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TAnnotationSMPFreebase.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TAnnotationSMPFreebase.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TAnnotationSMPFreebase.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TAnnotationWriterSMP.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TAnnotationWriterSMP.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TAnnotationWriterSMP.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TAnnotationWriterSMP.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TCellEntityRanker.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TCellEntityRanker.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TCellEntityRanker.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TCellEntityRanker.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TColumnClassifier.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TColumnClassifier.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TColumnClassifier.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TColumnClassifier.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TColumnColumnRelationEnumerator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TColumnColumnRelationEnumerator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TColumnColumnRelationEnumerator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/smp/TColumnColumnRelationEnumerator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LEARNING.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LEARNING.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LEARNING.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LEARNING.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LEARNINGPreliminaryColumnClassifier.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LEARNINGPreliminaryColumnClassifier.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LEARNINGPreliminaryColumnClassifier.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LEARNINGPreliminaryColumnClassifier.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LEARNINGPreliminaryDisamb.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LEARNINGPreliminaryDisamb.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LEARNINGPreliminaryDisamb.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LEARNINGPreliminaryDisamb.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LiteralColumnTagger.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LiteralColumnTagger.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LiteralColumnTagger.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LiteralColumnTagger.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LiteralColumnTaggerImpl.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LiteralColumnTaggerImpl.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LiteralColumnTaggerImpl.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/LiteralColumnTaggerImpl.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/RELATIONENUMERATION.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/RELATIONENUMERATION.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/RELATIONENUMERATION.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/RELATIONENUMERATION.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/TCellDisambiguator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/TCellDisambiguator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/TCellDisambiguator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/TCellDisambiguator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/TColumnClassifier.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/TColumnClassifier.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/TColumnClassifier.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/TColumnClassifier.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/TColumnColumnRelationEnumerator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/TColumnColumnRelationEnumerator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/TColumnColumnRelationEnumerator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/TColumnColumnRelationEnumerator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/TMPInterpreter.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/TMPInterpreter.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/TMPInterpreter.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/TMPInterpreter.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/UPDATE.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/UPDATE.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/UPDATE.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/UPDATE.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_combined.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_combined.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_combined.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_combined.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_contextWords.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_contextWords.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_contextWords.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_contextWords.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_nameLength.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_nameLength.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_nameLength.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_nameLength.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_namelength_merge.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_namelength_merge.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_namelength_merge.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_namelength_merge.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_nonEmpty.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_nonEmpty.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_nonEmpty.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_nonEmpty.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_random.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_random.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_random.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/OSPD_random.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/Random.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/Random.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/Random.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/Random.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/TContentCellRanker.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/TContentCellRanker.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/TContentCellRanker.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/TContentCellRanker.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/TContentRowRanker.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/TContentRowRanker.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/TContentRowRanker.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/TContentRowRanker.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/TContentTContentRowRankerImpl.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/TContentTContentRowRankerImpl.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/TContentTContentRowRankerImpl.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/sampler/TContentTContentRowRankerImpl.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/scorer/TMPClazzScorer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/scorer/TMPClazzScorer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/scorer/TMPClazzScorer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/scorer/TMPClazzScorer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/scorer/TMPEntityScorer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/scorer/TMPEntityScorer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/scorer/TMPEntityScorer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/scorer/TMPEntityScorer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/scorer/TMPRelationScorer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/scorer/TMPRelationScorer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/scorer/TMPRelationScorer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/scorer/TMPRelationScorer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/FixedNumberOfRows.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/FixedNumberOfRows.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/FixedNumberOfRows.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/FixedNumberOfRows.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/IInf.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/IInf.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/IInf.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/IInf.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/NoStop.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/NoStop.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/NoStop.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/NoStop.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/StoppingCriteria.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/StoppingCriteria.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/StoppingCriteria.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/StoppingCriteria.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/StoppingCriteriaInstantiator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/StoppingCriteriaInstantiator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/StoppingCriteriaInstantiator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/algorithm/tmp/stopping/StoppingCriteriaInstantiator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/feature/FreebaseConceptBoWCreator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/feature/FreebaseConceptBoWCreator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/feature/FreebaseConceptBoWCreator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/feature/FreebaseConceptBoWCreator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/feature/FreebaseRelationBoWCreator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/feature/FreebaseRelationBoWCreator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/feature/FreebaseRelationBoWCreator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/feature/FreebaseRelationBoWCreator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/feature/OntologyBasedBoWCreator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/feature/OntologyBasedBoWCreator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/feature/OntologyBasedBoWCreator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/feature/OntologyBasedBoWCreator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/model/List.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/List.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/model/List.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/List.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/model/ListItem.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/ListItem.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/model/ListItem.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/ListItem.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/model/RelationColumns.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/RelationColumns.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/model/RelationColumns.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/RelationColumns.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/model/TAnnotation.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/TAnnotation.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/model/TAnnotation.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/TAnnotation.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/model/TCell.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/TCell.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/model/TCell.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/TCell.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/model/TCellAnnotation.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/TCellAnnotation.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/model/TCellAnnotation.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/TCellAnnotation.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/model/TCellCellRelationAnotation.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/TCellCellRelationAnotation.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/model/TCellCellRelationAnotation.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/TCellCellRelationAnotation.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/model/TColumnColumnRelationAnnotation.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/TColumnColumnRelationAnnotation.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/model/TColumnColumnRelationAnnotation.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/TColumnColumnRelationAnnotation.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/model/TColumnHeader.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/TColumnHeader.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/model/TColumnHeader.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/TColumnHeader.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/model/TColumnHeaderAnnotation.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/TColumnHeaderAnnotation.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/model/TColumnHeaderAnnotation.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/TColumnHeaderAnnotation.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/model/TContext.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/TContext.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/model/TContext.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/TContext.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/model/Table.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/Table.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/model/Table.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/Table.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/model/TableTriple.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/TableTriple.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/model/TableTriple.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/model/TableTriple.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/scorer/AttributeValueMatcher.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/scorer/AttributeValueMatcher.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/scorer/AttributeValueMatcher.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/scorer/AttributeValueMatcher.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/scorer/ClazzScorer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/scorer/ClazzScorer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/scorer/ClazzScorer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/scorer/ClazzScorer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/scorer/EntityScorer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/scorer/EntityScorer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/scorer/EntityScorer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/scorer/EntityScorer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/scorer/RelationScorer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/scorer/RelationScorer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/scorer/RelationScorer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/scorer/RelationScorer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/CMScorer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/CMScorer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/CMScorer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/CMScorer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/SubjectColumnDetector.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/SubjectColumnDetector.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/SubjectColumnDetector.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/SubjectColumnDetector.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/SubjectColumnScorer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/SubjectColumnScorer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/SubjectColumnScorer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/SubjectColumnScorer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/SubjectColumnScorerHeuristic.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/SubjectColumnScorerHeuristic.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/SubjectColumnScorerHeuristic.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/SubjectColumnScorerHeuristic.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/TColumnDataType.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/TColumnDataType.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/TColumnDataType.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/TColumnDataType.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/TColumnFeature.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/TColumnFeature.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/TColumnFeature.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/TColumnFeature.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/TColumnFeatureGenerator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/TColumnFeatureGenerator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/TColumnFeatureGenerator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/TColumnFeatureGenerator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/WSScorer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/WSScorer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/WSScorer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/core/subjectcol/WSScorer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/experiment/BaselineBatch.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/experiment/BaselineBatch.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/experiment/BaselineBatch.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/experiment/BaselineBatch.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/experiment/JointInferenceBatch.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/experiment/JointInferenceBatch.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/experiment/JointInferenceBatch.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/experiment/JointInferenceBatch.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/experiment/STIBatch.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/experiment/STIBatch.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/experiment/STIBatch.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/experiment/STIBatch.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/experiment/SemanticMessagePassingBatch.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/experiment/SemanticMessagePassingBatch.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/experiment/SemanticMessagePassingBatch.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/experiment/SemanticMessagePassingBatch.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/experiment/TableMinerPlusBatch.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/experiment/TableMinerPlusBatch.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/experiment/TableMinerPlusBatch.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/experiment/TableMinerPlusBatch.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/io/JSONOutputCellAnnotation.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/io/JSONOutputCellAnnotation.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/io/JSONOutputCellAnnotation.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/io/JSONOutputCellAnnotation.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/io/JSONOutputColumnAnnotation.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/io/JSONOutputColumnAnnotation.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/io/JSONOutputColumnAnnotation.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/io/JSONOutputColumnAnnotation.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/io/JSONOutputRelationAnnotation.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/io/JSONOutputRelationAnnotation.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/io/JSONOutputRelationAnnotation.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/io/JSONOutputRelationAnnotation.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/io/JSONOutputRelationAnnotationPerRow.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/io/JSONOutputRelationAnnotationPerRow.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/io/JSONOutputRelationAnnotationPerRow.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/io/JSONOutputRelationAnnotationPerRow.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/io/TAnnotationWriter.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/io/TAnnotationWriter.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/io/TAnnotationWriter.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/io/TAnnotationWriter.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/io/TAnnotationWriterJSON.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/io/TAnnotationWriterJSON.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/io/TAnnotationWriterJSON.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/io/TAnnotationWriterJSON.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/nlp/Lemmatizer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/nlp/Lemmatizer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/nlp/Lemmatizer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/nlp/Lemmatizer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/nlp/NLPTools.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/nlp/NLPTools.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/nlp/NLPTools.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/nlp/NLPTools.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/nlp/TermFreqCounter.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/nlp/TermFreqCounter.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/nlp/TermFreqCounter.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/nlp/TermFreqCounter.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/ContentValidator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/ContentValidator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/ContentValidator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/ContentValidator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/list/ListXtractor.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/list/ListXtractor.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/list/ListXtractor.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/list/ListXtractor.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/list/ListXtractorHTML.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/list/ListXtractorHTML.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/list/ListXtractorHTML.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/list/ListXtractorHTML.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/list/ListXtractorWikipedia.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/list/ListXtractorWikipedia.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/list/ListXtractorWikipedia.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/list/ListXtractorWikipedia.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/list/splitter/ListItemSplitter.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/list/splitter/ListItemSplitter.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/list/splitter/ListItemSplitter.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/list/splitter/ListItemSplitter.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/list/splitter/ListItemSplitterByURL.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/list/splitter/ListItemSplitterByURL.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/list/splitter/ListItemSplitterByURL.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/list/splitter/ListItemSplitterByURL.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/list/validator/ListVaildatorLanient.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/list/validator/ListVaildatorLanient.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/list/validator/ListVaildatorLanient.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/list/validator/ListVaildatorLanient.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/list/validator/ListValidator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/list/validator/ListValidator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/list/validator/ListValidator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/list/validator/ListValidator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/list/validator/ListValidatorStrict.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/list/validator/ListValidatorStrict.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/list/validator/ListValidatorStrict.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/list/validator/ListValidatorStrict.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/Browsable.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/Browsable.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/Browsable.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/Browsable.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/BrowsableHelper.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/BrowsableHelper.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/BrowsableHelper.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/BrowsableHelper.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParser.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParser.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParser.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParser.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserHTML.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserHTML.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserHTML.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserHTML.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserIMDB.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserIMDB.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserIMDB.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserIMDB.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserLimayeDataset.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserLimayeDataset.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserLimayeDataset.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserLimayeDataset.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserMusicBrainz.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserMusicBrainz.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserMusicBrainz.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserMusicBrainz.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserReverbnation.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserReverbnation.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserReverbnation.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserReverbnation.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserRottenTomato.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserRottenTomato.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserRottenTomato.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserRottenTomato.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserWikipedia.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserWikipedia.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserWikipedia.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/TableParserWikipedia.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/context/TableContextExtractor.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/context/TableContextExtractor.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/context/TableContextExtractor.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/context/TableContextExtractor.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/context/TableContextExtractorGeneric.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/context/TableContextExtractorGeneric.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/context/TableContextExtractorGeneric.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/context/TableContextExtractorGeneric.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/context/TableContextExtractorIMDB.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/context/TableContextExtractorIMDB.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/context/TableContextExtractorIMDB.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/context/TableContextExtractorIMDB.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/context/TableContextExtractorMusicBrainz.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/context/TableContextExtractorMusicBrainz.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/context/TableContextExtractorMusicBrainz.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/context/TableContextExtractorMusicBrainz.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorGoodreads.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorGoodreads.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorGoodreads.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorGoodreads.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorHTML.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorHTML.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorHTML.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorHTML.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorIMDB.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorIMDB.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorIMDB.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorIMDB.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorMusicBrainz.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorMusicBrainz.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorMusicBrainz.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorMusicBrainz.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorReverbnationList.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorReverbnationList.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorReverbnationList.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorReverbnationList.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorWikipedia.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorWikipedia.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorWikipedia.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/creator/TableObjCreatorWikipedia.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/hodetector/TableHODetector.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/hodetector/TableHODetector.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/hodetector/TableHODetector.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/hodetector/TableHODetector.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/hodetector/TableHODetectorByHTMLTag.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/hodetector/TableHODetectorByHTMLTag.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/hodetector/TableHODetectorByHTMLTag.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/hodetector/TableHODetectorByHTMLTag.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/normalizer/TableNormalizer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/normalizer/TableNormalizer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/normalizer/TableNormalizer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/normalizer/TableNormalizer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/normalizer/TableNormalizerDiscardIrregularRows.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/normalizer/TableNormalizerDiscardIrregularRows.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/normalizer/TableNormalizerDiscardIrregularRows.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/normalizer/TableNormalizerDiscardIrregularRows.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/normalizer/TableNormalizerListTransformer.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/normalizer/TableNormalizerListTransformer.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/normalizer/TableNormalizerListTransformer.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/normalizer/TableNormalizerListTransformer.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/normalizer/TableNormalizerSimple.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/normalizer/TableNormalizerSimple.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/normalizer/TableNormalizerSimple.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/normalizer/TableNormalizerSimple.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/validator/TableValidator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/validator/TableValidator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/validator/TableValidator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/validator/TableValidator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/validator/TableValidatorForWikipediaGSLanient.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/validator/TableValidatorForWikipediaGSLanient.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/validator/TableValidatorForWikipediaGSLanient.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/validator/TableValidatorForWikipediaGSLanient.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/validator/TableValidatorForWikipediaGSStrict.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/validator/TableValidatorForWikipediaGSStrict.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/validator/TableValidatorForWikipediaGSStrict.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/validator/TableValidatorForWikipediaGSStrict.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/parser/table/validator/TableValidatorGeneric.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/validator/TableValidatorGeneric.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/parser/table/validator/TableValidatorGeneric.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/parser/table/validator/TableValidatorGeneric.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/ui/EmailHandler.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/ui/EmailHandler.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/ui/EmailHandler.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/ui/EmailHandler.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/ui/InputFilePreview.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/ui/InputFilePreview.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/ui/InputFilePreview.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/ui/InputFilePreview.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/ui/TableMinerPlusSingle.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/ui/TableMinerPlusSingle.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/ui/TableMinerPlusSingle.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/ui/TableMinerPlusSingle.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/util/CollectionUtils.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/util/CollectionUtils.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/util/CollectionUtils.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/util/CollectionUtils.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/util/DataTypeClassifier.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/util/DataTypeClassifier.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/util/DataTypeClassifier.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/util/DataTypeClassifier.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/util/FileUtils.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/util/FileUtils.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/util/FileUtils.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/util/FileUtils.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/util/SubsetGenerator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/util/SubsetGenerator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/util/SubsetGenerator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/util/SubsetGenerator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/util/TripleGenerator.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/util/TripleGenerator.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/util/TripleGenerator.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/util/TripleGenerator.java
diff --git a/core/src/main/java/uk/ac/shef/dcs/sti/util/XPathUtils.java b/sti-main/src/main/java/uk/ac/shef/dcs/sti/util/XPathUtils.java
similarity index 100%
rename from core/src/main/java/uk/ac/shef/dcs/sti/util/XPathUtils.java
rename to sti-main/src/main/java/uk/ac/shef/dcs/sti/util/XPathUtils.java
diff --git a/sti-websearch/pom.xml b/sti-websearch/pom.xml
new file mode 100644
index 00000000..cdfea61a
--- /dev/null
+++ b/sti-websearch/pom.xml
@@ -0,0 +1,54 @@
+
+
+ 4.0.0
+
+ uk.ac.shef.dcs
+ sti-websearch
+ 1.0
+
+
+ UTF-8
+
+
+
+
+ commons-lang
+ commons-lang
+ 2.6
+
+
+
+ commons-codec
+ commons-codec
+ 1.9
+
+
+ javax.json
+ javax.json-api
+ 1.0
+
+
+ org.glassfish
+ javax.json
+ 1.0.4
+
+
+
+
+
+ src
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 2.3.2
+
+ 1.8
+ 1.8
+
+
+
+
+
\ No newline at end of file
diff --git a/websearch/src/uk/ac/shef/dcs/websearch/SearchResultParser.java b/sti-websearch/src/uk/ac/shef/dcs/websearch/SearchResultParser.java
similarity index 100%
rename from websearch/src/uk/ac/shef/dcs/websearch/SearchResultParser.java
rename to sti-websearch/src/uk/ac/shef/dcs/websearch/SearchResultParser.java
diff --git a/websearch/src/uk/ac/shef/dcs/websearch/WebSearch.java b/sti-websearch/src/uk/ac/shef/dcs/websearch/WebSearch.java
similarity index 100%
rename from websearch/src/uk/ac/shef/dcs/websearch/WebSearch.java
rename to sti-websearch/src/uk/ac/shef/dcs/websearch/WebSearch.java
diff --git a/websearch/src/uk/ac/shef/dcs/websearch/WebSearchException.java b/sti-websearch/src/uk/ac/shef/dcs/websearch/WebSearchException.java
similarity index 100%
rename from websearch/src/uk/ac/shef/dcs/websearch/WebSearchException.java
rename to sti-websearch/src/uk/ac/shef/dcs/websearch/WebSearchException.java
diff --git a/websearch/src/uk/ac/shef/dcs/websearch/WebSearchFactory.java b/sti-websearch/src/uk/ac/shef/dcs/websearch/WebSearchFactory.java
similarity index 100%
rename from websearch/src/uk/ac/shef/dcs/websearch/WebSearchFactory.java
rename to sti-websearch/src/uk/ac/shef/dcs/websearch/WebSearchFactory.java
diff --git a/websearch/src/uk/ac/shef/dcs/websearch/WebSearchResultDoc.java b/sti-websearch/src/uk/ac/shef/dcs/websearch/WebSearchResultDoc.java
similarity index 100%
rename from websearch/src/uk/ac/shef/dcs/websearch/WebSearchResultDoc.java
rename to sti-websearch/src/uk/ac/shef/dcs/websearch/WebSearchResultDoc.java
diff --git a/websearch/src/uk/ac/shef/dcs/websearch/bing/v2/APIKeysDepletedException.java b/sti-websearch/src/uk/ac/shef/dcs/websearch/bing/v2/APIKeysDepletedException.java
similarity index 100%
rename from websearch/src/uk/ac/shef/dcs/websearch/bing/v2/APIKeysDepletedException.java
rename to sti-websearch/src/uk/ac/shef/dcs/websearch/bing/v2/APIKeysDepletedException.java
diff --git a/websearch/src/uk/ac/shef/dcs/websearch/bing/v2/BingSearch.java b/sti-websearch/src/uk/ac/shef/dcs/websearch/bing/v2/BingSearch.java
similarity index 100%
rename from websearch/src/uk/ac/shef/dcs/websearch/bing/v2/BingSearch.java
rename to sti-websearch/src/uk/ac/shef/dcs/websearch/bing/v2/BingSearch.java
diff --git a/websearch/src/uk/ac/shef/dcs/websearch/bing/v2/BingSearchResultParser.java b/sti-websearch/src/uk/ac/shef/dcs/websearch/bing/v2/BingSearchResultParser.java
similarity index 100%
rename from websearch/src/uk/ac/shef/dcs/websearch/bing/v2/BingSearchResultParser.java
rename to sti-websearch/src/uk/ac/shef/dcs/websearch/bing/v2/BingSearchResultParser.java
diff --git a/websearch/pom.xml b/websearch/pom.xml
deleted file mode 100644
index ed5cdbb4..00000000
--- a/websearch/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
- 4.0.0
-
- uk.ac.shef.dcs
- websearch
- 1.0
-
-
- UTF-8
-
-
- src
-
-
- true
- org.apache.maven.plugins
- maven-compiler-plugin
-
- 1.8
- 1.8
- UTF-8
-
-
-
-
-
-
-
- commons-lang
- commons-lang
- 2.6
-
-
-
- commons-codec
- commons-codec
- 1.9
-
-
- javax.json
- javax.json-api
- 1.0
-
-
- org.glassfish
- javax.json
- 1.0.4
-
-
-
-
-
\ No newline at end of file