diff --git a/README.md b/README.md index a8067be397a1d84c5aec392a7654735d6c0d3595..d0736e8e670bfc677702681a0b1883ed369012d7 100644 --- a/README.md +++ b/README.md @@ -1,39 +1,9 @@ -# TDTS21 Project - A performance study on ad blockers with an comparison between internal and landing pages +# TDTS21 Project - A performance study focusing on ad blockers and internal- vs landing pages <p> - There is three main parts of the code, under privacy extension master you can find - our version of <a href="https://github.com/noise-lab/privacy-extensions">the code</a> - written by Borgolte et al. Look at their code to get installation guidance. Which we - found lacking some steps in order to get the code working for our part. Secondly, - we have code that extract the data from the tests in the extract_data folder. - And lastly in extract_data/extracted_csv_files/ you can find MatLab code - that gives you CMD graphs from the extracted data. + In the folder "code_from_borgolte_et_al" we have saved a slightly modified version of the code written by Borgolte et al. + This code parses a list of sites and tests different ad blockers on the every web page. All data is saved as har files on a postgreSQL database. </p> - -# Extract data - -<p> - In the folder extract_data we have all the code that is used in order to create our graphs. - If you have exported a json file of your own with help of the code that Borgolte et al. - have created. Then you can use DataByExtensionExtracter.java to get all data order by extension. - If you want to have the difference of every extension compared to the no extension setup, - then you use DifferenceDataExtracter.java. In order to run the extracter code you type - the following: - <ul> - <li>Add "sluttelisluttsomfan" in the last line of your .json file</li> - <li>javac DifferenceDataExtracter.java</li> - <li>java DifferenceDataExtracter < yourJsonFile.json</li> - </ul> - Thereafter data is saved in extracted_csv_files in corresponding folders. -</p> - -# Create graphs - <p> - Run the MatLab code to get CDF figures. Make sure that you have the right file names in the - code to find the extracted files -</p> - - - - + In the folder "code_written_by_us" there are mainly code that extract important data from the HAR-files that borgoltes code provide. +</p> \ No newline at end of file diff --git a/code_written_by_us/README.md b/code_written_by_us/README.md new file mode 100644 index 0000000000000000000000000000000000000000..62d418e0bab9658a19aeace348f92077b1b8ada9 --- /dev/null +++ b/code_written_by_us/README.md @@ -0,0 +1,13 @@ +# Where to find what and how to use it + + + +<h2>parse_gathered_har_data</h2> +<p> + Here two files are mainly doing the work. First "parser.py" goes through the raw HAR-data retreived from the postgreSQL database. parser.py saves its result in the bottom/top_all_tests.json file which is later used by extract_data.py. extract_data.py removes all tests which does not have any tests to compare with and thereafter orders them per web page and saves the results in bottom/top_data.json. But, extract_data.py does also save .csv files in cdf_data_and_matlab_code. Here are files saved which can later be used by Matlab code to create the CDF graphs. +</p> + +<h2>categorizing</h2> +<p> + In the folder categorizing, code and data can be found where we have categorized the data by country, Top Level Domains and the amount of trackers. An attempt to display the data as whisker plots and some heatmap versions are also made. In the folder whisker, only values that are important for a box and whisker plot is provided and can be used to make nice whisker plots. An attempt to make whisker plots with matlab was done and that code is also provided. +</p> diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/Extension-comparison.xlsx b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/Extension-comparison.xlsx similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/Extension-comparison.xlsx rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/Extension-comparison.xlsx diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/internal_.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/internal_.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/internal_.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/internal_.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/internal_adblock_plus.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/internal_adblock_plus.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/internal_adblock_plus.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/internal_adblock_plus.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/internal_ghostery_privacy_ad_blocker.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/internal_ghostery_privacy_ad_blocker.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/internal_ghostery_privacy_ad_blocker.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/internal_ghostery_privacy_ad_blocker.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/internal_privacy_badger.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/internal_privacy_badger.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/internal_privacy_badger.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/internal_privacy_badger.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/internal_ublock_origin.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/internal_ublock_origin.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/internal_ublock_origin.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/internal_ublock_origin.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/landing_.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/landing_.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/landing_.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/landing_.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/landing_adblock_plus.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/landing_adblock_plus.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/landing_adblock_plus.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/landing_adblock_plus.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/landing_ghostery_privacy_ad_blocker.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/landing_ghostery_privacy_ad_blocker.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/landing_ghostery_privacy_ad_blocker.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/landing_ghostery_privacy_ad_blocker.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/landing_privacy_badger.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/landing_privacy_badger.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/landing_privacy_badger.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/landing_privacy_badger.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/landing_ublock_origin.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/landing_ublock_origin.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/by_ext/landing_ublock_origin.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/by_ext/landing_ublock_origin.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/internal_.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/internal_.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/internal_.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/internal_.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/internal_adblock_plus.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/internal_adblock_plus.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/internal_adblock_plus.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/internal_adblock_plus.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/internal_ghostery_privacy_ad_blocker.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/internal_ghostery_privacy_ad_blocker.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/internal_ghostery_privacy_ad_blocker.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/internal_ghostery_privacy_ad_blocker.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/internal_privacy_badger.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/internal_privacy_badger.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/internal_privacy_badger.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/internal_privacy_badger.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/internal_ublock_origin.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/internal_ublock_origin.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/internal_ublock_origin.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/internal_ublock_origin.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/landing_.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/landing_.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/landing_.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/landing_.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/landing_adblock_plus.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/landing_adblock_plus.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/landing_adblock_plus.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/landing_adblock_plus.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/landing_ghostery_privacy_ad_blocker.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/landing_ghostery_privacy_ad_blocker.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/landing_ghostery_privacy_ad_blocker.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/landing_ghostery_privacy_ad_blocker.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/landing_privacy_badger.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/landing_privacy_badger.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/landing_privacy_badger.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/landing_privacy_badger.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/landing_ublock_origin.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/landing_ublock_origin.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/bottom_ten/diff_by_ext/landing_ublock_origin.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/bottom_ten/diff_by_ext/landing_ublock_origin.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/box_plot.m b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/box_plot.m similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/box_plot.m rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/box_plot.m diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/create_difference_graphs.m b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/create_difference_graphs.m similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/create_difference_graphs.m rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/create_difference_graphs.m diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/create_landing_vs_internal_graphs_bottom.m b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/create_landing_vs_internal_graphs_bottom.m similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/create_landing_vs_internal_graphs_bottom.m rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/create_landing_vs_internal_graphs_bottom.m diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/create_landing_vs_internal_graphs_top.m b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/create_landing_vs_internal_graphs_top.m similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/create_landing_vs_internal_graphs_top.m rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/create_landing_vs_internal_graphs_top.m diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/matlab-graphs/bottom_five_difference.eps b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/matlab-graphs/bottom_five_difference.eps similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/matlab-graphs/bottom_five_difference.eps rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/matlab-graphs/bottom_five_difference.eps diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/matlab-graphs/bottomten.eps b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/matlab-graphs/bottomten.eps similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/matlab-graphs/bottomten.eps rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/matlab-graphs/bottomten.eps diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/matlab-graphs/bottomten_byext.eps b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/matlab-graphs/bottomten_byext.eps similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/matlab-graphs/bottomten_byext.eps rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/matlab-graphs/bottomten_byext.eps diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/matlab-graphs/difference_graph.eps b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/matlab-graphs/difference_graph.eps similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/matlab-graphs/difference_graph.eps rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/matlab-graphs/difference_graph.eps diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/matlab-graphs/top_five_difference.eps b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/matlab-graphs/top_five_difference.eps similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/matlab-graphs/top_five_difference.eps rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/matlab-graphs/top_five_difference.eps diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/matlab-graphs/top_five_only_no_ext.eps b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/matlab-graphs/top_five_only_no_ext.eps similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/matlab-graphs/top_five_only_no_ext.eps rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/matlab-graphs/top_five_only_no_ext.eps diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/matlab-graphs/topten.eps b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/matlab-graphs/topten.eps similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/matlab-graphs/topten.eps rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/matlab-graphs/topten.eps diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/matlab-graphs/topten_byext.eps b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/matlab-graphs/topten_byext.eps similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/matlab-graphs/topten_byext.eps rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/matlab-graphs/topten_byext.eps diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/only_no_ext.m b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/only_no_ext.m similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/only_no_ext.m rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/only_no_ext.m diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/start pa heat.m b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/start pa heat.m similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/start pa heat.m rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/start pa heat.m diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/symlog.m b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/symlog.m similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/symlog.m rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/symlog.m diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/test.m b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/test.m similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/test.m rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/test.m diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/internal_.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/internal_.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/internal_.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/internal_.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/internal_adblock_plus.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/internal_adblock_plus.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/internal_adblock_plus.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/internal_adblock_plus.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/internal_ghostery_privacy_ad_blocker.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/internal_ghostery_privacy_ad_blocker.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/internal_ghostery_privacy_ad_blocker.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/internal_ghostery_privacy_ad_blocker.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/internal_privacy_badger.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/internal_privacy_badger.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/internal_privacy_badger.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/internal_privacy_badger.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/internal_ublock_origin.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/internal_ublock_origin.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/internal_ublock_origin.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/internal_ublock_origin.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/landing_.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/landing_.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/landing_.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/landing_.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/landing_adblock_plus.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/landing_adblock_plus.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/landing_adblock_plus.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/landing_adblock_plus.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/landing_ghostery_privacy_ad_blocker.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/landing_ghostery_privacy_ad_blocker.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/landing_ghostery_privacy_ad_blocker.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/landing_ghostery_privacy_ad_blocker.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/landing_privacy_badger.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/landing_privacy_badger.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/landing_privacy_badger.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/landing_privacy_badger.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/landing_ublock_origin.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/landing_ublock_origin.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/by_ext/landing_ublock_origin.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/by_ext/landing_ublock_origin.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/internal_.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/internal_.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/internal_.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/internal_.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/internal_adblock_plus.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/internal_adblock_plus.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/internal_adblock_plus.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/internal_adblock_plus.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/internal_ghostery_privacy_ad_blocker.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/internal_ghostery_privacy_ad_blocker.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/internal_ghostery_privacy_ad_blocker.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/internal_ghostery_privacy_ad_blocker.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/internal_privacy_badger.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/internal_privacy_badger.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/internal_privacy_badger.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/internal_privacy_badger.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/internal_ublock_origin.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/internal_ublock_origin.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/internal_ublock_origin.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/internal_ublock_origin.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/landing_.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/landing_.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/landing_.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/landing_.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/landing_adblock_plus.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/landing_adblock_plus.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/landing_adblock_plus.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/landing_adblock_plus.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/landing_ghostery_privacy_ad_blocker.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/landing_ghostery_privacy_ad_blocker.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/landing_ghostery_privacy_ad_blocker.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/landing_ghostery_privacy_ad_blocker.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/landing_privacy_badger.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/landing_privacy_badger.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/landing_privacy_badger.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/landing_privacy_badger.csv diff --git a/code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/landing_ublock_origin.csv b/code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/landing_ublock_origin.csv similarity index 100% rename from code_written_by_us/parse_gathered_har_data/extracted_csv_files/top_ten/diff_by_ext/landing_ublock_origin.csv rename to code_written_by_us/parse_gathered_har_data/cdf_data_and_matlab_code/top_ten/diff_by_ext/landing_ublock_origin.csv diff --git a/code_written_by_us/specialJsonParser/2021-06-16 09-21-56.csv b/code_written_by_us/parse_gathered_har_data/old_java_code/specialJsonParser/2021-06-16 09-21-56.csv similarity index 100% rename from code_written_by_us/specialJsonParser/2021-06-16 09-21-56.csv rename to code_written_by_us/parse_gathered_har_data/old_java_code/specialJsonParser/2021-06-16 09-21-56.csv diff --git a/code_written_by_us/specialJsonParser/2021-06-16 10-04-32.csv b/code_written_by_us/parse_gathered_har_data/old_java_code/specialJsonParser/2021-06-16 10-04-32.csv similarity index 100% rename from code_written_by_us/specialJsonParser/2021-06-16 10-04-32.csv rename to code_written_by_us/parse_gathered_har_data/old_java_code/specialJsonParser/2021-06-16 10-04-32.csv diff --git a/code_written_by_us/specialJsonParser/2021-06-16 10-05-04.csv b/code_written_by_us/parse_gathered_har_data/old_java_code/specialJsonParser/2021-06-16 10-05-04.csv similarity index 100% rename from code_written_by_us/specialJsonParser/2021-06-16 10-05-04.csv rename to code_written_by_us/parse_gathered_har_data/old_java_code/specialJsonParser/2021-06-16 10-05-04.csv diff --git a/code_written_by_us/specialJsonParser/2021-06-16 12-27-52.csv b/code_written_by_us/parse_gathered_har_data/old_java_code/specialJsonParser/2021-06-16 12-27-52.csv similarity index 100% rename from code_written_by_us/specialJsonParser/2021-06-16 12-27-52.csv rename to code_written_by_us/parse_gathered_har_data/old_java_code/specialJsonParser/2021-06-16 12-27-52.csv diff --git a/code_written_by_us/specialJsonParser/2021-06-23 09-18-34.csv b/code_written_by_us/parse_gathered_har_data/old_java_code/specialJsonParser/2021-06-23 09-18-34.csv similarity index 100% rename from code_written_by_us/specialJsonParser/2021-06-23 09-18-34.csv rename to code_written_by_us/parse_gathered_har_data/old_java_code/specialJsonParser/2021-06-23 09-18-34.csv diff --git a/code_written_by_us/specialJsonParser/2021-06-23 14-25-46.csv b/code_written_by_us/parse_gathered_har_data/old_java_code/specialJsonParser/2021-06-23 14-25-46.csv similarity index 100% rename from code_written_by_us/specialJsonParser/2021-06-23 14-25-46.csv rename to code_written_by_us/parse_gathered_har_data/old_java_code/specialJsonParser/2021-06-23 14-25-46.csv diff --git a/code_written_by_us/specialJsonParser/2021-06-23 14-29-43.csv b/code_written_by_us/parse_gathered_har_data/old_java_code/specialJsonParser/2021-06-23 14-29-43.csv similarity index 100% rename from code_written_by_us/specialJsonParser/2021-06-23 14-29-43.csv rename to code_written_by_us/parse_gathered_har_data/old_java_code/specialJsonParser/2021-06-23 14-29-43.csv diff --git a/code_written_by_us/specialJsonParser/SpecialJsonParser.java b/code_written_by_us/parse_gathered_har_data/old_java_code/specialJsonParser/SpecialJsonParser.java similarity index 100% rename from code_written_by_us/specialJsonParser/SpecialJsonParser.java rename to code_written_by_us/parse_gathered_har_data/old_java_code/specialJsonParser/SpecialJsonParser.java diff --git a/extract-data/har_data/bottomTen/july-7.json b/extract-data/har_data/bottomTen/july-7.json deleted file mode 100644 index 6debec89c45dc501a03c2035a7817241a0656f9c..0000000000000000000000000000000000000000 Binary files a/extract-data/har_data/bottomTen/july-7.json and /dev/null differ