From 9c49ed08981eaa16f7f841422b3c8cfa6e3f9292 Mon Sep 17 00:00:00 2001 From: Steevan BARBOYON Date: Fri, 17 Jan 2020 15:04:48 +0100 Subject: [PATCH] Compatibility with benchmark kit 4.0.0-DEV --- .circleci/config.yml | 21 + .gitignore | 5 +- .phpbenchmarks/config.yml | 23 + .phpbenchmarks/nginx/vhost.conf | 15 + .../php/7.1/composer.lock | 4 +- .phpbenchmarks/php/7.1/initBenchmark.sh | 5 + .phpbenchmarks/php/7.1/php.ini | 0 .../php/7.1/responseBody/responseBody.html | 2 +- README.md | 39 +- composer.json | 4 +- init_benchmark.sh | 8 - public/index.php | 1010 ++++++++--------- {public => src}/benchmark_generator.php | 0 {overload => src}/blocks.php | 0 {overload => src}/functions.php | 0 {overload => src}/macros.php | 0 {overload => templates/layout}/layout_end.php | 0 .../layout}/layout_start.php | 4 +- .../template}/template1.php | 0 .../template}/template10.php | 0 .../template}/template100.php | 0 .../template}/template101.php | 0 .../template}/template102.php | 0 .../template}/template103.php | 0 .../template}/template104.php | 0 .../template}/template105.php | 0 .../template}/template106.php | 0 .../template}/template107.php | 0 .../template}/template108.php | 0 .../template}/template109.php | 0 .../template}/template11.php | 0 .../template}/template110.php | 0 .../template}/template111.php | 0 .../template}/template112.php | 0 .../template}/template113.php | 0 .../template}/template114.php | 0 .../template}/template115.php | 0 .../template}/template116.php | 0 .../template}/template117.php | 0 .../template}/template118.php | 0 .../template}/template119.php | 0 .../template}/template12.php | 0 .../template}/template120.php | 0 .../template}/template121.php | 0 .../template}/template122.php | 0 .../template}/template123.php | 0 .../template}/template124.php | 0 .../template}/template125.php | 0 .../template}/template126.php | 0 .../template}/template127.php | 0 .../template}/template128.php | 0 .../template}/template129.php | 0 .../template}/template13.php | 0 .../template}/template130.php | 0 .../template}/template131.php | 0 .../template}/template132.php | 0 .../template}/template133.php | 0 .../template}/template134.php | 0 .../template}/template135.php | 0 .../template}/template136.php | 0 .../template}/template137.php | 0 .../template}/template138.php | 0 .../template}/template139.php | 0 .../template}/template14.php | 0 .../template}/template140.php | 0 .../template}/template141.php | 0 .../template}/template142.php | 0 .../template}/template143.php | 0 .../template}/template144.php | 0 .../template}/template145.php | 0 .../template}/template146.php | 0 .../template}/template147.php | 0 .../template}/template148.php | 0 .../template}/template149.php | 0 .../template}/template15.php | 0 .../template}/template150.php | 0 .../template}/template151.php | 0 .../template}/template152.php | 0 .../template}/template153.php | 0 .../template}/template154.php | 0 .../template}/template155.php | 0 .../template}/template156.php | 0 .../template}/template157.php | 0 .../template}/template158.php | 0 .../template}/template159.php | 0 .../template}/template16.php | 0 .../template}/template160.php | 0 .../template}/template161.php | 0 .../template}/template162.php | 0 .../template}/template163.php | 0 .../template}/template164.php | 0 .../template}/template165.php | 0 .../template}/template166.php | 0 .../template}/template167.php | 0 .../template}/template168.php | 0 .../template}/template169.php | 0 .../template}/template17.php | 0 .../template}/template170.php | 0 .../template}/template171.php | 0 .../template}/template172.php | 0 .../template}/template173.php | 0 .../template}/template174.php | 0 .../template}/template175.php | 0 .../template}/template176.php | 0 .../template}/template177.php | 0 .../template}/template178.php | 0 .../template}/template179.php | 0 .../template}/template18.php | 0 .../template}/template180.php | 0 .../template}/template181.php | 0 .../template}/template182.php | 0 .../template}/template183.php | 0 .../template}/template184.php | 0 .../template}/template185.php | 0 .../template}/template186.php | 0 .../template}/template187.php | 0 .../template}/template188.php | 0 .../template}/template189.php | 0 .../template}/template19.php | 0 .../template}/template190.php | 0 .../template}/template191.php | 0 .../template}/template192.php | 0 .../template}/template193.php | 0 .../template}/template194.php | 0 .../template}/template195.php | 0 .../template}/template196.php | 0 .../template}/template197.php | 0 .../template}/template198.php | 0 .../template}/template199.php | 0 .../template}/template2.php | 0 .../template}/template20.php | 0 .../template}/template200.php | 0 .../template}/template201.php | 0 .../template}/template202.php | 0 .../template}/template203.php | 0 .../template}/template204.php | 0 .../template}/template205.php | 0 .../template}/template206.php | 0 .../template}/template207.php | 0 .../template}/template208.php | 0 .../template}/template209.php | 0 .../template}/template21.php | 0 .../template}/template210.php | 0 .../template}/template211.php | 0 .../template}/template212.php | 0 .../template}/template213.php | 0 .../template}/template214.php | 0 .../template}/template215.php | 0 .../template}/template216.php | 0 .../template}/template217.php | 0 .../template}/template218.php | 0 .../template}/template219.php | 0 .../template}/template22.php | 0 .../template}/template220.php | 0 .../template}/template221.php | 0 .../template}/template222.php | 0 .../template}/template223.php | 0 .../template}/template224.php | 0 .../template}/template225.php | 0 .../template}/template226.php | 0 .../template}/template227.php | 0 .../template}/template228.php | 0 .../template}/template229.php | 0 .../template}/template23.php | 0 .../template}/template230.php | 0 .../template}/template231.php | 0 .../template}/template232.php | 0 .../template}/template233.php | 0 .../template}/template234.php | 0 .../template}/template235.php | 0 .../template}/template236.php | 0 .../template}/template237.php | 0 .../template}/template238.php | 0 .../template}/template239.php | 0 .../template}/template24.php | 0 .../template}/template240.php | 0 .../template}/template241.php | 0 .../template}/template242.php | 0 .../template}/template243.php | 0 .../template}/template244.php | 0 .../template}/template245.php | 0 .../template}/template246.php | 0 .../template}/template247.php | 0 .../template}/template248.php | 0 .../template}/template249.php | 0 .../template}/template25.php | 0 .../template}/template250.php | 0 .../template}/template251.php | 0 .../template}/template252.php | 0 .../template}/template253.php | 0 .../template}/template254.php | 0 .../template}/template255.php | 0 .../template}/template256.php | 0 .../template}/template257.php | 0 .../template}/template258.php | 0 .../template}/template259.php | 0 .../template}/template26.php | 0 .../template}/template260.php | 0 .../template}/template261.php | 0 .../template}/template262.php | 0 .../template}/template263.php | 0 .../template}/template264.php | 0 .../template}/template265.php | 0 .../template}/template266.php | 0 .../template}/template267.php | 0 .../template}/template268.php | 0 .../template}/template269.php | 0 .../template}/template27.php | 0 .../template}/template270.php | 0 .../template}/template271.php | 0 .../template}/template272.php | 0 .../template}/template273.php | 0 .../template}/template274.php | 0 .../template}/template275.php | 0 .../template}/template276.php | 0 .../template}/template277.php | 0 .../template}/template278.php | 0 .../template}/template279.php | 0 .../template}/template28.php | 0 .../template}/template280.php | 0 .../template}/template281.php | 0 .../template}/template282.php | 0 .../template}/template283.php | 0 .../template}/template284.php | 0 .../template}/template285.php | 0 .../template}/template286.php | 0 .../template}/template287.php | 0 .../template}/template288.php | 0 .../template}/template289.php | 0 .../template}/template29.php | 0 .../template}/template290.php | 0 .../template}/template291.php | 0 .../template}/template292.php | 0 .../template}/template293.php | 0 .../template}/template294.php | 0 .../template}/template295.php | 0 .../template}/template296.php | 0 .../template}/template297.php | 0 .../template}/template298.php | 0 .../template}/template299.php | 0 .../template}/template3.php | 0 .../template}/template30.php | 0 .../template}/template300.php | 0 .../template}/template301.php | 0 .../template}/template302.php | 0 .../template}/template303.php | 0 .../template}/template304.php | 0 .../template}/template305.php | 0 .../template}/template306.php | 0 .../template}/template307.php | 0 .../template}/template308.php | 0 .../template}/template309.php | 0 .../template}/template31.php | 0 .../template}/template310.php | 0 .../template}/template311.php | 0 .../template}/template312.php | 0 .../template}/template313.php | 0 .../template}/template314.php | 0 .../template}/template315.php | 0 .../template}/template316.php | 0 .../template}/template317.php | 0 .../template}/template318.php | 0 .../template}/template319.php | 0 .../template}/template32.php | 0 .../template}/template320.php | 0 .../template}/template321.php | 0 .../template}/template322.php | 0 .../template}/template323.php | 0 .../template}/template324.php | 0 .../template}/template325.php | 0 .../template}/template326.php | 0 .../template}/template327.php | 0 .../template}/template328.php | 0 .../template}/template329.php | 0 .../template}/template33.php | 0 .../template}/template330.php | 0 .../template}/template331.php | 0 .../template}/template332.php | 0 .../template}/template333.php | 0 .../template}/template334.php | 0 .../template}/template335.php | 0 .../template}/template336.php | 0 .../template}/template337.php | 0 .../template}/template338.php | 0 .../template}/template339.php | 0 .../template}/template34.php | 0 .../template}/template340.php | 0 .../template}/template341.php | 0 .../template}/template342.php | 0 .../template}/template343.php | 0 .../template}/template344.php | 0 .../template}/template345.php | 0 .../template}/template346.php | 0 .../template}/template347.php | 0 .../template}/template348.php | 0 .../template}/template349.php | 0 .../template}/template35.php | 0 .../template}/template350.php | 0 .../template}/template351.php | 0 .../template}/template352.php | 0 .../template}/template353.php | 0 .../template}/template354.php | 0 .../template}/template355.php | 0 .../template}/template356.php | 0 .../template}/template357.php | 0 .../template}/template358.php | 0 .../template}/template359.php | 0 .../template}/template36.php | 0 .../template}/template360.php | 0 .../template}/template361.php | 0 .../template}/template362.php | 0 .../template}/template363.php | 0 .../template}/template364.php | 0 .../template}/template365.php | 0 .../template}/template366.php | 0 .../template}/template367.php | 0 .../template}/template368.php | 0 .../template}/template369.php | 0 .../template}/template37.php | 0 .../template}/template370.php | 0 .../template}/template371.php | 0 .../template}/template372.php | 0 .../template}/template373.php | 0 .../template}/template374.php | 0 .../template}/template375.php | 0 .../template}/template376.php | 0 .../template}/template377.php | 0 .../template}/template378.php | 0 .../template}/template379.php | 0 .../template}/template38.php | 0 .../template}/template380.php | 0 .../template}/template381.php | 0 .../template}/template382.php | 0 .../template}/template383.php | 0 .../template}/template384.php | 0 .../template}/template385.php | 0 .../template}/template386.php | 0 .../template}/template387.php | 0 .../template}/template388.php | 0 .../template}/template389.php | 0 .../template}/template39.php | 0 .../template}/template390.php | 0 .../template}/template391.php | 0 .../template}/template392.php | 0 .../template}/template393.php | 0 .../template}/template394.php | 0 .../template}/template395.php | 0 .../template}/template396.php | 0 .../template}/template397.php | 0 .../template}/template398.php | 0 .../template}/template399.php | 0 .../template}/template4.php | 0 .../template}/template40.php | 0 .../template}/template400.php | 0 .../template}/template401.php | 0 .../template}/template402.php | 0 .../template}/template403.php | 0 .../template}/template404.php | 0 .../template}/template405.php | 0 .../template}/template406.php | 0 .../template}/template407.php | 0 .../template}/template408.php | 0 .../template}/template409.php | 0 .../template}/template41.php | 0 .../template}/template410.php | 0 .../template}/template411.php | 0 .../template}/template412.php | 0 .../template}/template413.php | 0 .../template}/template414.php | 0 .../template}/template415.php | 0 .../template}/template416.php | 0 .../template}/template417.php | 0 .../template}/template418.php | 0 .../template}/template419.php | 0 .../template}/template42.php | 0 .../template}/template420.php | 0 .../template}/template421.php | 0 .../template}/template422.php | 0 .../template}/template423.php | 0 .../template}/template424.php | 0 .../template}/template425.php | 0 .../template}/template426.php | 0 .../template}/template427.php | 0 .../template}/template428.php | 0 .../template}/template429.php | 0 .../template}/template43.php | 0 .../template}/template430.php | 0 .../template}/template431.php | 0 .../template}/template432.php | 0 .../template}/template433.php | 0 .../template}/template434.php | 0 .../template}/template435.php | 0 .../template}/template436.php | 0 .../template}/template437.php | 0 .../template}/template438.php | 0 .../template}/template439.php | 0 .../template}/template44.php | 0 .../template}/template440.php | 0 .../template}/template441.php | 0 .../template}/template442.php | 0 .../template}/template443.php | 0 .../template}/template444.php | 0 .../template}/template445.php | 0 .../template}/template446.php | 0 .../template}/template447.php | 0 .../template}/template448.php | 0 .../template}/template449.php | 0 .../template}/template45.php | 0 .../template}/template450.php | 0 .../template}/template451.php | 0 .../template}/template452.php | 0 .../template}/template453.php | 0 .../template}/template454.php | 0 .../template}/template455.php | 0 .../template}/template456.php | 0 .../template}/template457.php | 0 .../template}/template458.php | 0 .../template}/template459.php | 0 .../template}/template46.php | 0 .../template}/template460.php | 0 .../template}/template461.php | 0 .../template}/template462.php | 0 .../template}/template463.php | 0 .../template}/template464.php | 0 .../template}/template465.php | 0 .../template}/template466.php | 0 .../template}/template467.php | 0 .../template}/template468.php | 0 .../template}/template469.php | 0 .../template}/template47.php | 0 .../template}/template470.php | 0 .../template}/template471.php | 0 .../template}/template472.php | 0 .../template}/template473.php | 0 .../template}/template474.php | 0 .../template}/template475.php | 0 .../template}/template476.php | 0 .../template}/template477.php | 0 .../template}/template478.php | 0 .../template}/template479.php | 0 .../template}/template48.php | 0 .../template}/template480.php | 0 .../template}/template481.php | 0 .../template}/template482.php | 0 .../template}/template483.php | 0 .../template}/template484.php | 0 .../template}/template485.php | 0 .../template}/template486.php | 0 .../template}/template487.php | 0 .../template}/template488.php | 0 .../template}/template489.php | 0 .../template}/template49.php | 0 .../template}/template490.php | 0 .../template}/template491.php | 0 .../template}/template492.php | 0 .../template}/template493.php | 0 .../template}/template494.php | 0 .../template}/template495.php | 0 .../template}/template496.php | 0 .../template}/template497.php | 0 .../template}/template498.php | 0 .../template}/template499.php | 0 .../template}/template5.php | 0 .../template}/template50.php | 0 .../template}/template500.php | 0 .../template}/template51.php | 0 .../template}/template52.php | 0 .../template}/template53.php | 0 .../template}/template54.php | 0 .../template}/template55.php | 0 .../template}/template56.php | 0 .../template}/template57.php | 0 .../template}/template58.php | 0 .../template}/template59.php | 0 .../template}/template6.php | 0 .../template}/template60.php | 0 .../template}/template61.php | 0 .../template}/template62.php | 0 .../template}/template63.php | 0 .../template}/template64.php | 0 .../template}/template65.php | 0 .../template}/template66.php | 0 .../template}/template67.php | 0 .../template}/template68.php | 0 .../template}/template69.php | 0 .../template}/template7.php | 0 .../template}/template70.php | 0 .../template}/template71.php | 0 .../template}/template72.php | 0 .../template}/template73.php | 0 .../template}/template74.php | 0 .../template}/template75.php | 0 .../template}/template76.php | 0 .../template}/template77.php | 0 .../template}/template78.php | 0 .../template}/template79.php | 0 .../template}/template8.php | 0 .../template}/template80.php | 0 .../template}/template81.php | 0 .../template}/template82.php | 0 .../template}/template83.php | 0 .../template}/template84.php | 0 .../template}/template85.php | 0 .../template}/template86.php | 0 .../template}/template87.php | 0 .../template}/template88.php | 0 .../template}/template89.php | 0 .../template}/template9.php | 0 .../template}/template90.php | 0 .../template}/template91.php | 0 .../template}/template92.php | 0 .../template}/template93.php | 0 .../template}/template94.php | 0 .../template}/template95.php | 0 .../template}/template96.php | 0 .../template}/template97.php | 0 .../template}/template98.php | 0 .../template}/template99.php | 0 518 files changed, 605 insertions(+), 535 deletions(-) create mode 100644 .circleci/config.yml create mode 100644 .phpbenchmarks/config.yml create mode 100644 .phpbenchmarks/nginx/vhost.conf rename composer.lock.php7.1 => .phpbenchmarks/php/7.1/composer.lock (85%) create mode 100755 .phpbenchmarks/php/7.1/initBenchmark.sh create mode 100644 .phpbenchmarks/php/7.1/php.ini rename response.html => .phpbenchmarks/php/7.1/responseBody/responseBody.html (99%) delete mode 100755 init_benchmark.sh rename {public => src}/benchmark_generator.php (100%) rename {overload => src}/blocks.php (100%) rename {overload => src}/functions.php (100%) rename {overload => src}/macros.php (100%) rename {overload => templates/layout}/layout_end.php (100%) rename {overload => templates/layout}/layout_start.php (93%) rename {overload/templates => templates/template}/template1.php (100%) rename {overload/templates => templates/template}/template10.php (100%) rename {overload/templates => templates/template}/template100.php (100%) rename {overload/templates => templates/template}/template101.php (100%) rename {overload/templates => templates/template}/template102.php (100%) rename {overload/templates => templates/template}/template103.php (100%) rename {overload/templates => templates/template}/template104.php (100%) rename {overload/templates => templates/template}/template105.php (100%) rename {overload/templates => templates/template}/template106.php (100%) rename {overload/templates => templates/template}/template107.php (100%) rename {overload/templates => templates/template}/template108.php (100%) rename {overload/templates => templates/template}/template109.php (100%) rename {overload/templates => templates/template}/template11.php (100%) rename {overload/templates => templates/template}/template110.php (100%) rename {overload/templates => templates/template}/template111.php (100%) rename {overload/templates => templates/template}/template112.php (100%) rename {overload/templates => templates/template}/template113.php (100%) rename {overload/templates => templates/template}/template114.php (100%) rename {overload/templates => templates/template}/template115.php (100%) rename {overload/templates => templates/template}/template116.php (100%) rename {overload/templates => templates/template}/template117.php (100%) rename {overload/templates => templates/template}/template118.php (100%) rename {overload/templates => templates/template}/template119.php (100%) rename {overload/templates => templates/template}/template12.php (100%) rename {overload/templates => templates/template}/template120.php (100%) rename {overload/templates => templates/template}/template121.php (100%) rename {overload/templates => templates/template}/template122.php (100%) rename {overload/templates => templates/template}/template123.php (100%) rename {overload/templates => templates/template}/template124.php (100%) rename {overload/templates => templates/template}/template125.php (100%) rename {overload/templates => templates/template}/template126.php (100%) rename {overload/templates => templates/template}/template127.php (100%) rename {overload/templates => templates/template}/template128.php (100%) rename {overload/templates => templates/template}/template129.php (100%) rename {overload/templates => templates/template}/template13.php (100%) rename {overload/templates => templates/template}/template130.php (100%) rename {overload/templates => templates/template}/template131.php (100%) rename {overload/templates => templates/template}/template132.php (100%) rename {overload/templates => templates/template}/template133.php (100%) rename {overload/templates => templates/template}/template134.php (100%) rename {overload/templates => templates/template}/template135.php (100%) rename {overload/templates => templates/template}/template136.php (100%) rename {overload/templates => templates/template}/template137.php (100%) rename {overload/templates => templates/template}/template138.php (100%) rename {overload/templates => templates/template}/template139.php (100%) rename {overload/templates => templates/template}/template14.php (100%) rename {overload/templates => templates/template}/template140.php (100%) rename {overload/templates => templates/template}/template141.php (100%) rename {overload/templates => templates/template}/template142.php (100%) rename {overload/templates => templates/template}/template143.php (100%) rename {overload/templates => templates/template}/template144.php (100%) rename {overload/templates => templates/template}/template145.php (100%) rename {overload/templates => templates/template}/template146.php (100%) rename {overload/templates => templates/template}/template147.php (100%) rename {overload/templates => templates/template}/template148.php (100%) rename {overload/templates => templates/template}/template149.php (100%) rename {overload/templates => templates/template}/template15.php (100%) rename {overload/templates => templates/template}/template150.php (100%) rename {overload/templates => templates/template}/template151.php (100%) rename {overload/templates => templates/template}/template152.php (100%) rename {overload/templates => templates/template}/template153.php (100%) rename {overload/templates => templates/template}/template154.php (100%) rename {overload/templates => templates/template}/template155.php (100%) rename {overload/templates => templates/template}/template156.php (100%) rename {overload/templates => templates/template}/template157.php (100%) rename {overload/templates => templates/template}/template158.php (100%) rename {overload/templates => templates/template}/template159.php (100%) rename {overload/templates => templates/template}/template16.php (100%) rename {overload/templates => templates/template}/template160.php (100%) rename {overload/templates => templates/template}/template161.php (100%) rename {overload/templates => templates/template}/template162.php (100%) rename {overload/templates => templates/template}/template163.php (100%) rename {overload/templates => templates/template}/template164.php (100%) rename {overload/templates => templates/template}/template165.php (100%) rename {overload/templates => templates/template}/template166.php (100%) rename {overload/templates => templates/template}/template167.php (100%) rename {overload/templates => templates/template}/template168.php (100%) rename {overload/templates => templates/template}/template169.php (100%) rename {overload/templates => templates/template}/template17.php (100%) rename {overload/templates => templates/template}/template170.php (100%) rename {overload/templates => templates/template}/template171.php (100%) rename {overload/templates => templates/template}/template172.php (100%) rename {overload/templates => templates/template}/template173.php (100%) rename {overload/templates => templates/template}/template174.php (100%) rename {overload/templates => templates/template}/template175.php (100%) rename {overload/templates => templates/template}/template176.php (100%) rename {overload/templates => templates/template}/template177.php (100%) rename {overload/templates => templates/template}/template178.php (100%) rename {overload/templates => templates/template}/template179.php (100%) rename {overload/templates => templates/template}/template18.php (100%) rename {overload/templates => templates/template}/template180.php (100%) rename {overload/templates => templates/template}/template181.php (100%) rename {overload/templates => templates/template}/template182.php (100%) rename {overload/templates => templates/template}/template183.php (100%) rename {overload/templates => templates/template}/template184.php (100%) rename {overload/templates => templates/template}/template185.php (100%) rename {overload/templates => templates/template}/template186.php (100%) rename {overload/templates => templates/template}/template187.php (100%) rename {overload/templates => templates/template}/template188.php (100%) rename {overload/templates => templates/template}/template189.php (100%) rename {overload/templates => templates/template}/template19.php (100%) rename {overload/templates => templates/template}/template190.php (100%) rename {overload/templates => templates/template}/template191.php (100%) rename {overload/templates => templates/template}/template192.php (100%) rename {overload/templates => templates/template}/template193.php (100%) rename {overload/templates => templates/template}/template194.php (100%) rename {overload/templates => templates/template}/template195.php (100%) rename {overload/templates => templates/template}/template196.php (100%) rename {overload/templates => templates/template}/template197.php (100%) rename {overload/templates => templates/template}/template198.php (100%) rename {overload/templates => templates/template}/template199.php (100%) rename {overload/templates => templates/template}/template2.php (100%) rename {overload/templates => templates/template}/template20.php (100%) rename {overload/templates => templates/template}/template200.php (100%) rename {overload/templates => templates/template}/template201.php (100%) rename {overload/templates => templates/template}/template202.php (100%) rename {overload/templates => templates/template}/template203.php (100%) rename {overload/templates => templates/template}/template204.php (100%) rename {overload/templates => templates/template}/template205.php (100%) rename {overload/templates => templates/template}/template206.php (100%) rename {overload/templates => templates/template}/template207.php (100%) rename {overload/templates => templates/template}/template208.php (100%) rename {overload/templates => templates/template}/template209.php (100%) rename {overload/templates => templates/template}/template21.php (100%) rename {overload/templates => templates/template}/template210.php (100%) rename {overload/templates => templates/template}/template211.php (100%) rename {overload/templates => templates/template}/template212.php (100%) rename {overload/templates => templates/template}/template213.php (100%) rename {overload/templates => templates/template}/template214.php (100%) rename {overload/templates => templates/template}/template215.php (100%) rename {overload/templates => templates/template}/template216.php (100%) rename {overload/templates => templates/template}/template217.php (100%) rename {overload/templates => templates/template}/template218.php (100%) rename {overload/templates => templates/template}/template219.php (100%) rename {overload/templates => templates/template}/template22.php (100%) rename {overload/templates => templates/template}/template220.php (100%) rename {overload/templates => templates/template}/template221.php (100%) rename {overload/templates => templates/template}/template222.php (100%) rename {overload/templates => templates/template}/template223.php (100%) rename {overload/templates => templates/template}/template224.php (100%) rename {overload/templates => templates/template}/template225.php (100%) rename {overload/templates => templates/template}/template226.php (100%) rename {overload/templates => templates/template}/template227.php (100%) rename {overload/templates => templates/template}/template228.php (100%) rename {overload/templates => templates/template}/template229.php (100%) rename {overload/templates => templates/template}/template23.php (100%) rename {overload/templates => templates/template}/template230.php (100%) rename {overload/templates => templates/template}/template231.php (100%) rename {overload/templates => templates/template}/template232.php (100%) rename {overload/templates => templates/template}/template233.php (100%) rename {overload/templates => templates/template}/template234.php (100%) rename {overload/templates => templates/template}/template235.php (100%) rename {overload/templates => templates/template}/template236.php (100%) rename {overload/templates => templates/template}/template237.php (100%) rename {overload/templates => templates/template}/template238.php (100%) rename {overload/templates => templates/template}/template239.php (100%) rename {overload/templates => templates/template}/template24.php (100%) rename {overload/templates => templates/template}/template240.php (100%) rename {overload/templates => templates/template}/template241.php (100%) rename {overload/templates => templates/template}/template242.php (100%) rename {overload/templates => templates/template}/template243.php (100%) rename {overload/templates => templates/template}/template244.php (100%) rename {overload/templates => templates/template}/template245.php (100%) rename {overload/templates => templates/template}/template246.php (100%) rename {overload/templates => templates/template}/template247.php (100%) rename {overload/templates => templates/template}/template248.php (100%) rename {overload/templates => templates/template}/template249.php (100%) rename {overload/templates => templates/template}/template25.php (100%) rename {overload/templates => templates/template}/template250.php (100%) rename {overload/templates => templates/template}/template251.php (100%) rename {overload/templates => templates/template}/template252.php (100%) rename {overload/templates => templates/template}/template253.php (100%) rename {overload/templates => templates/template}/template254.php (100%) rename {overload/templates => templates/template}/template255.php (100%) rename {overload/templates => templates/template}/template256.php (100%) rename {overload/templates => templates/template}/template257.php (100%) rename {overload/templates => templates/template}/template258.php (100%) rename {overload/templates => templates/template}/template259.php (100%) rename {overload/templates => templates/template}/template26.php (100%) rename {overload/templates => templates/template}/template260.php (100%) rename {overload/templates => templates/template}/template261.php (100%) rename {overload/templates => templates/template}/template262.php (100%) rename {overload/templates => templates/template}/template263.php (100%) rename {overload/templates => templates/template}/template264.php (100%) rename {overload/templates => templates/template}/template265.php (100%) rename {overload/templates => templates/template}/template266.php (100%) rename {overload/templates => templates/template}/template267.php (100%) rename {overload/templates => templates/template}/template268.php (100%) rename {overload/templates => templates/template}/template269.php (100%) rename {overload/templates => templates/template}/template27.php (100%) rename {overload/templates => templates/template}/template270.php (100%) rename {overload/templates => templates/template}/template271.php (100%) rename {overload/templates => templates/template}/template272.php (100%) rename {overload/templates => templates/template}/template273.php (100%) rename {overload/templates => templates/template}/template274.php (100%) rename {overload/templates => templates/template}/template275.php (100%) rename {overload/templates => templates/template}/template276.php (100%) rename {overload/templates => templates/template}/template277.php (100%) rename {overload/templates => templates/template}/template278.php (100%) rename {overload/templates => templates/template}/template279.php (100%) rename {overload/templates => templates/template}/template28.php (100%) rename {overload/templates => templates/template}/template280.php (100%) rename {overload/templates => templates/template}/template281.php (100%) rename {overload/templates => templates/template}/template282.php (100%) rename {overload/templates => templates/template}/template283.php (100%) rename {overload/templates => templates/template}/template284.php (100%) rename {overload/templates => templates/template}/template285.php (100%) rename {overload/templates => templates/template}/template286.php (100%) rename {overload/templates => templates/template}/template287.php (100%) rename {overload/templates => templates/template}/template288.php (100%) rename {overload/templates => templates/template}/template289.php (100%) rename {overload/templates => templates/template}/template29.php (100%) rename {overload/templates => templates/template}/template290.php (100%) rename {overload/templates => templates/template}/template291.php (100%) rename {overload/templates => templates/template}/template292.php (100%) rename {overload/templates => templates/template}/template293.php (100%) rename {overload/templates => templates/template}/template294.php (100%) rename {overload/templates => templates/template}/template295.php (100%) rename {overload/templates => templates/template}/template296.php (100%) rename {overload/templates => templates/template}/template297.php (100%) rename {overload/templates => templates/template}/template298.php (100%) rename {overload/templates => templates/template}/template299.php (100%) rename {overload/templates => templates/template}/template3.php (100%) rename {overload/templates => templates/template}/template30.php (100%) rename {overload/templates => templates/template}/template300.php (100%) rename {overload/templates => templates/template}/template301.php (100%) rename {overload/templates => templates/template}/template302.php (100%) rename {overload/templates => templates/template}/template303.php (100%) rename {overload/templates => templates/template}/template304.php (100%) rename {overload/templates => templates/template}/template305.php (100%) rename {overload/templates => templates/template}/template306.php (100%) rename {overload/templates => templates/template}/template307.php (100%) rename {overload/templates => templates/template}/template308.php (100%) rename {overload/templates => templates/template}/template309.php (100%) rename {overload/templates => templates/template}/template31.php (100%) rename {overload/templates => templates/template}/template310.php (100%) rename {overload/templates => templates/template}/template311.php (100%) rename {overload/templates => templates/template}/template312.php (100%) rename {overload/templates => templates/template}/template313.php (100%) rename {overload/templates => templates/template}/template314.php (100%) rename {overload/templates => templates/template}/template315.php (100%) rename {overload/templates => templates/template}/template316.php (100%) rename {overload/templates => templates/template}/template317.php (100%) rename {overload/templates => templates/template}/template318.php (100%) rename {overload/templates => templates/template}/template319.php (100%) rename {overload/templates => templates/template}/template32.php (100%) rename {overload/templates => templates/template}/template320.php (100%) rename {overload/templates => templates/template}/template321.php (100%) rename {overload/templates => templates/template}/template322.php (100%) rename {overload/templates => templates/template}/template323.php (100%) rename {overload/templates => templates/template}/template324.php (100%) rename {overload/templates => templates/template}/template325.php (100%) rename {overload/templates => templates/template}/template326.php (100%) rename {overload/templates => templates/template}/template327.php (100%) rename {overload/templates => templates/template}/template328.php (100%) rename {overload/templates => templates/template}/template329.php (100%) rename {overload/templates => templates/template}/template33.php (100%) rename {overload/templates => templates/template}/template330.php (100%) rename {overload/templates => templates/template}/template331.php (100%) rename {overload/templates => templates/template}/template332.php (100%) rename {overload/templates => templates/template}/template333.php (100%) rename {overload/templates => templates/template}/template334.php (100%) rename {overload/templates => templates/template}/template335.php (100%) rename {overload/templates => templates/template}/template336.php (100%) rename {overload/templates => templates/template}/template337.php (100%) rename {overload/templates => templates/template}/template338.php (100%) rename {overload/templates => templates/template}/template339.php (100%) rename {overload/templates => templates/template}/template34.php (100%) rename {overload/templates => templates/template}/template340.php (100%) rename {overload/templates => templates/template}/template341.php (100%) rename {overload/templates => templates/template}/template342.php (100%) rename {overload/templates => templates/template}/template343.php (100%) rename {overload/templates => templates/template}/template344.php (100%) rename {overload/templates => templates/template}/template345.php (100%) rename {overload/templates => templates/template}/template346.php (100%) rename {overload/templates => templates/template}/template347.php (100%) rename {overload/templates => templates/template}/template348.php (100%) rename {overload/templates => templates/template}/template349.php (100%) rename {overload/templates => templates/template}/template35.php (100%) rename {overload/templates => templates/template}/template350.php (100%) rename {overload/templates => templates/template}/template351.php (100%) rename {overload/templates => templates/template}/template352.php (100%) rename {overload/templates => templates/template}/template353.php (100%) rename {overload/templates => templates/template}/template354.php (100%) rename {overload/templates => templates/template}/template355.php (100%) rename {overload/templates => templates/template}/template356.php (100%) rename {overload/templates => templates/template}/template357.php (100%) rename {overload/templates => templates/template}/template358.php (100%) rename {overload/templates => templates/template}/template359.php (100%) rename {overload/templates => templates/template}/template36.php (100%) rename {overload/templates => templates/template}/template360.php (100%) rename {overload/templates => templates/template}/template361.php (100%) rename {overload/templates => templates/template}/template362.php (100%) rename {overload/templates => templates/template}/template363.php (100%) rename {overload/templates => templates/template}/template364.php (100%) rename {overload/templates => templates/template}/template365.php (100%) rename {overload/templates => templates/template}/template366.php (100%) rename {overload/templates => templates/template}/template367.php (100%) rename {overload/templates => templates/template}/template368.php (100%) rename {overload/templates => templates/template}/template369.php (100%) rename {overload/templates => templates/template}/template37.php (100%) rename {overload/templates => templates/template}/template370.php (100%) rename {overload/templates => templates/template}/template371.php (100%) rename {overload/templates => templates/template}/template372.php (100%) rename {overload/templates => templates/template}/template373.php (100%) rename {overload/templates => templates/template}/template374.php (100%) rename {overload/templates => templates/template}/template375.php (100%) rename {overload/templates => templates/template}/template376.php (100%) rename {overload/templates => templates/template}/template377.php (100%) rename {overload/templates => templates/template}/template378.php (100%) rename {overload/templates => templates/template}/template379.php (100%) rename {overload/templates => templates/template}/template38.php (100%) rename {overload/templates => templates/template}/template380.php (100%) rename {overload/templates => templates/template}/template381.php (100%) rename {overload/templates => templates/template}/template382.php (100%) rename {overload/templates => templates/template}/template383.php (100%) rename {overload/templates => templates/template}/template384.php (100%) rename {overload/templates => templates/template}/template385.php (100%) rename {overload/templates => templates/template}/template386.php (100%) rename {overload/templates => templates/template}/template387.php (100%) rename {overload/templates => templates/template}/template388.php (100%) rename {overload/templates => templates/template}/template389.php (100%) rename {overload/templates => templates/template}/template39.php (100%) rename {overload/templates => templates/template}/template390.php (100%) rename {overload/templates => templates/template}/template391.php (100%) rename {overload/templates => templates/template}/template392.php (100%) rename {overload/templates => templates/template}/template393.php (100%) rename {overload/templates => templates/template}/template394.php (100%) rename {overload/templates => templates/template}/template395.php (100%) rename {overload/templates => templates/template}/template396.php (100%) rename {overload/templates => templates/template}/template397.php (100%) rename {overload/templates => templates/template}/template398.php (100%) rename {overload/templates => templates/template}/template399.php (100%) rename {overload/templates => templates/template}/template4.php (100%) rename {overload/templates => templates/template}/template40.php (100%) rename {overload/templates => templates/template}/template400.php (100%) rename {overload/templates => templates/template}/template401.php (100%) rename {overload/templates => templates/template}/template402.php (100%) rename {overload/templates => templates/template}/template403.php (100%) rename {overload/templates => templates/template}/template404.php (100%) rename {overload/templates => templates/template}/template405.php (100%) rename {overload/templates => templates/template}/template406.php (100%) rename {overload/templates => templates/template}/template407.php (100%) rename {overload/templates => templates/template}/template408.php (100%) rename {overload/templates => templates/template}/template409.php (100%) rename {overload/templates => templates/template}/template41.php (100%) rename {overload/templates => templates/template}/template410.php (100%) rename {overload/templates => templates/template}/template411.php (100%) rename {overload/templates => templates/template}/template412.php (100%) rename {overload/templates => templates/template}/template413.php (100%) rename {overload/templates => templates/template}/template414.php (100%) rename {overload/templates => templates/template}/template415.php (100%) rename {overload/templates => templates/template}/template416.php (100%) rename {overload/templates => templates/template}/template417.php (100%) rename {overload/templates => templates/template}/template418.php (100%) rename {overload/templates => templates/template}/template419.php (100%) rename {overload/templates => templates/template}/template42.php (100%) rename {overload/templates => templates/template}/template420.php (100%) rename {overload/templates => templates/template}/template421.php (100%) rename {overload/templates => templates/template}/template422.php (100%) rename {overload/templates => templates/template}/template423.php (100%) rename {overload/templates => templates/template}/template424.php (100%) rename {overload/templates => templates/template}/template425.php (100%) rename {overload/templates => templates/template}/template426.php (100%) rename {overload/templates => templates/template}/template427.php (100%) rename {overload/templates => templates/template}/template428.php (100%) rename {overload/templates => templates/template}/template429.php (100%) rename {overload/templates => templates/template}/template43.php (100%) rename {overload/templates => templates/template}/template430.php (100%) rename {overload/templates => templates/template}/template431.php (100%) rename {overload/templates => templates/template}/template432.php (100%) rename {overload/templates => templates/template}/template433.php (100%) rename {overload/templates => templates/template}/template434.php (100%) rename {overload/templates => templates/template}/template435.php (100%) rename {overload/templates => templates/template}/template436.php (100%) rename {overload/templates => templates/template}/template437.php (100%) rename {overload/templates => templates/template}/template438.php (100%) rename {overload/templates => templates/template}/template439.php (100%) rename {overload/templates => templates/template}/template44.php (100%) rename {overload/templates => templates/template}/template440.php (100%) rename {overload/templates => templates/template}/template441.php (100%) rename {overload/templates => templates/template}/template442.php (100%) rename {overload/templates => templates/template}/template443.php (100%) rename {overload/templates => templates/template}/template444.php (100%) rename {overload/templates => templates/template}/template445.php (100%) rename {overload/templates => templates/template}/template446.php (100%) rename {overload/templates => templates/template}/template447.php (100%) rename {overload/templates => templates/template}/template448.php (100%) rename {overload/templates => templates/template}/template449.php (100%) rename {overload/templates => templates/template}/template45.php (100%) rename {overload/templates => templates/template}/template450.php (100%) rename {overload/templates => templates/template}/template451.php (100%) rename {overload/templates => templates/template}/template452.php (100%) rename {overload/templates => templates/template}/template453.php (100%) rename {overload/templates => templates/template}/template454.php (100%) rename {overload/templates => templates/template}/template455.php (100%) rename {overload/templates => templates/template}/template456.php (100%) rename {overload/templates => templates/template}/template457.php (100%) rename {overload/templates => templates/template}/template458.php (100%) rename {overload/templates => templates/template}/template459.php (100%) rename {overload/templates => templates/template}/template46.php (100%) rename {overload/templates => templates/template}/template460.php (100%) rename {overload/templates => templates/template}/template461.php (100%) rename {overload/templates => templates/template}/template462.php (100%) rename {overload/templates => templates/template}/template463.php (100%) rename {overload/templates => templates/template}/template464.php (100%) rename {overload/templates => templates/template}/template465.php (100%) rename {overload/templates => templates/template}/template466.php (100%) rename {overload/templates => templates/template}/template467.php (100%) rename {overload/templates => templates/template}/template468.php (100%) rename {overload/templates => templates/template}/template469.php (100%) rename {overload/templates => templates/template}/template47.php (100%) rename {overload/templates => templates/template}/template470.php (100%) rename {overload/templates => templates/template}/template471.php (100%) rename {overload/templates => templates/template}/template472.php (100%) rename {overload/templates => templates/template}/template473.php (100%) rename {overload/templates => templates/template}/template474.php (100%) rename {overload/templates => templates/template}/template475.php (100%) rename {overload/templates => templates/template}/template476.php (100%) rename {overload/templates => templates/template}/template477.php (100%) rename {overload/templates => templates/template}/template478.php (100%) rename {overload/templates => templates/template}/template479.php (100%) rename {overload/templates => templates/template}/template48.php (100%) rename {overload/templates => templates/template}/template480.php (100%) rename {overload/templates => templates/template}/template481.php (100%) rename {overload/templates => templates/template}/template482.php (100%) rename {overload/templates => templates/template}/template483.php (100%) rename {overload/templates => templates/template}/template484.php (100%) rename {overload/templates => templates/template}/template485.php (100%) rename {overload/templates => templates/template}/template486.php (100%) rename {overload/templates => templates/template}/template487.php (100%) rename {overload/templates => templates/template}/template488.php (100%) rename {overload/templates => templates/template}/template489.php (100%) rename {overload/templates => templates/template}/template49.php (100%) rename {overload/templates => templates/template}/template490.php (100%) rename {overload/templates => templates/template}/template491.php (100%) rename {overload/templates => templates/template}/template492.php (100%) rename {overload/templates => templates/template}/template493.php (100%) rename {overload/templates => templates/template}/template494.php (100%) rename {overload/templates => templates/template}/template495.php (100%) rename {overload/templates => templates/template}/template496.php (100%) rename {overload/templates => templates/template}/template497.php (100%) rename {overload/templates => templates/template}/template498.php (100%) rename {overload/templates => templates/template}/template499.php (100%) rename {overload/templates => templates/template}/template5.php (100%) rename {overload/templates => templates/template}/template50.php (100%) rename {overload/templates => templates/template}/template500.php (100%) rename {overload/templates => templates/template}/template51.php (100%) rename {overload/templates => templates/template}/template52.php (100%) rename {overload/templates => templates/template}/template53.php (100%) rename {overload/templates => templates/template}/template54.php (100%) rename {overload/templates => templates/template}/template55.php (100%) rename {overload/templates => templates/template}/template56.php (100%) rename {overload/templates => templates/template}/template57.php (100%) rename {overload/templates => templates/template}/template58.php (100%) rename {overload/templates => templates/template}/template59.php (100%) rename {overload/templates => templates/template}/template6.php (100%) rename {overload/templates => templates/template}/template60.php (100%) rename {overload/templates => templates/template}/template61.php (100%) rename {overload/templates => templates/template}/template62.php (100%) rename {overload/templates => templates/template}/template63.php (100%) rename {overload/templates => templates/template}/template64.php (100%) rename {overload/templates => templates/template}/template65.php (100%) rename {overload/templates => templates/template}/template66.php (100%) rename {overload/templates => templates/template}/template67.php (100%) rename {overload/templates => templates/template}/template68.php (100%) rename {overload/templates => templates/template}/template69.php (100%) rename {overload/templates => templates/template}/template7.php (100%) rename {overload/templates => templates/template}/template70.php (100%) rename {overload/templates => templates/template}/template71.php (100%) rename {overload/templates => templates/template}/template72.php (100%) rename {overload/templates => templates/template}/template73.php (100%) rename {overload/templates => templates/template}/template74.php (100%) rename {overload/templates => templates/template}/template75.php (100%) rename {overload/templates => templates/template}/template76.php (100%) rename {overload/templates => templates/template}/template77.php (100%) rename {overload/templates => templates/template}/template78.php (100%) rename {overload/templates => templates/template}/template79.php (100%) rename {overload/templates => templates/template}/template8.php (100%) rename {overload/templates => templates/template}/template80.php (100%) rename {overload/templates => templates/template}/template81.php (100%) rename {overload/templates => templates/template}/template82.php (100%) rename {overload/templates => templates/template}/template83.php (100%) rename {overload/templates => templates/template}/template84.php (100%) rename {overload/templates => templates/template}/template85.php (100%) rename {overload/templates => templates/template}/template86.php (100%) rename {overload/templates => templates/template}/template87.php (100%) rename {overload/templates => templates/template}/template88.php (100%) rename {overload/templates => templates/template}/template89.php (100%) rename {overload/templates => templates/template}/template9.php (100%) rename {overload/templates => templates/template}/template90.php (100%) rename {overload/templates => templates/template}/template91.php (100%) rename {overload/templates => templates/template}/template92.php (100%) rename {overload/templates => templates/template}/template93.php (100%) rename {overload/templates => templates/template}/template94.php (100%) rename {overload/templates => templates/template}/template95.php (100%) rename {overload/templates => templates/template}/template96.php (100%) rename {overload/templates => templates/template}/template97.php (100%) rename {overload/templates => templates/template}/template98.php (100%) rename {overload/templates => templates/template}/template99.php (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..041b39b --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,21 @@ +version: '2.1' + +jobs: + ValidateBenchmark: + docker: + - image: phpbenchmarks/benchmark-kit:4 + working_directory: /var/www/benchmark + steps: + - checkout + - run: + name: /var/entrypoint.sh + command: /var/entrypoint.sh --nginx-as-service + - run: + name: "benchmark:validate" + command: "/var/benchmark-kit/bin/console benchmark:validate:all" + +workflows: + version: '2.1' + BenchmarkKit: + jobs: + - ValidateBenchmark diff --git a/.gitignore b/.gitignore index 072705c..de4a392 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -.idea/ -vendor/ -composer.lock +/vendor +/composer.lock diff --git a/.phpbenchmarks/config.yml b/.phpbenchmarks/config.yml new file mode 100644 index 0000000..0a714a1 --- /dev/null +++ b/.phpbenchmarks/config.yml @@ -0,0 +1,23 @@ +component: + id: 1 +benchmark: + type: 5 + relativeUrl: / +sourceCode: + entryPoint: public/index.php + urls: + template: 'https://github.com/phpbenchmarks/php/tree/7.1.33_templating-big-overload_0/public/index.php' + templatingLayout: 'https://github.com/phpbenchmarks/php/tree/7.1.33_templating-big-overload_0/public/index.php#L6' + templatingBlocks: 'https://github.com/phpbenchmarks/php/tree/7.1.33_templating-big-overload_0/templates/layout/layout_start.php#L10' + templatingFunctions: 'https://github.com/phpbenchmarks/php/tree/7.1.33_templating-big-overload_0/public/index.php#L8' + templatingMacros: 'https://github.com/phpbenchmarks/php/tree/7.1.33_templating-big-overload_0/public/index.php#L4032' + templatingEscapeStringHtml: 'https://github.com/phpbenchmarks/php/tree/7.1.33_templating-big-overload_0/public/index.php#8056' + templatingEscapeStringJs: 'https://github.com/phpbenchmarks/php/tree/7.1.33_templating-big-overload_0/public/index.php#28077' + templatingVariables: 'https://github.com/phpbenchmarks/php/tree/7.1.33_templating-big-overload_0/public/index.php#L5933' + templatingOutputRaw: 'https://github.com/phpbenchmarks/php/tree/7.1.33_templating-big-overload_0/public/index.php#L58133' + templatingOutputUnknownVariables: 'https://github.com/phpbenchmarks/php/tree/7.1.33_templating-big-overload_0/public/index.php#L67155' + templatingOutputMethodCalls: 'https://github.com/phpbenchmarks/php/tree/7.1.33_templating-big-overload_0/public/index.php#L71177' + templatingIncludeTemplates: 'https://github.com/phpbenchmarks/php/tree/7.1.33_templating-big-overload_0/public/index.php#L91208' +coreDependency: + name: php + version: 7.1.33 diff --git a/.phpbenchmarks/nginx/vhost.conf b/.phpbenchmarks/nginx/vhost.conf new file mode 100644 index 0000000..d7dba5a --- /dev/null +++ b/.phpbenchmarks/nginx/vhost.conf @@ -0,0 +1,15 @@ +server { + listen ____PORT____; + server_name ____HOST____; + root ____INSTALLATION_PATH____/public; + location / { + try_files $uri /index.php$is_args$args; + } + location ~ ^/(index).php(/|$) { + fastcgi_pass unix:/run/php/____PHP_FPM_SOCK____; + fastcgi_split_path_info ^(.+.php)(/.*)$; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param HTTPS off; + } +} diff --git a/composer.lock.php7.1 b/.phpbenchmarks/php/7.1/composer.lock similarity index 85% rename from composer.lock.php7.1 rename to .phpbenchmarks/php/7.1/composer.lock index befd422..866b65c 100644 --- a/composer.lock.php7.1 +++ b/.phpbenchmarks/php/7.1/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d3c7e0f49f33f2ef3b149155b2fde926", + "content-hash": "7e955e2b5b00dc9876f3110cde1fae51", "packages": [], "packages-dev": [], "aliases": [], @@ -13,7 +13,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "7.1.*" + "php": "7.1.33" }, "platform-dev": [] } diff --git a/.phpbenchmarks/php/7.1/initBenchmark.sh b/.phpbenchmarks/php/7.1/initBenchmark.sh new file mode 100755 index 0000000..f61c58a --- /dev/null +++ b/.phpbenchmarks/php/7.1/initBenchmark.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -e + +composer install --no-dev --classmap-authoritative --ansi diff --git a/.phpbenchmarks/php/7.1/php.ini b/.phpbenchmarks/php/7.1/php.ini new file mode 100644 index 0000000..e69de29 diff --git a/response.html b/.phpbenchmarks/php/7.1/responseBody/responseBody.html similarity index 99% rename from response.html rename to .phpbenchmarks/php/7.1/responseBody/responseBody.html index c21cd22..014987c 100644 --- a/response.html +++ b/.phpbenchmarks/php/7.1/responseBody/responseBody.html @@ -4,7 +4,7 @@ - Small overload benchmark + Big overload benchmark
diff --git a/README.md b/README.md index 21a0fe3..bf8b80b 100644 --- a/README.md +++ b/README.md @@ -4,24 +4,41 @@ www.phpbenchmarks.com

-## What is www.phpbenchmarks.com ? +## What is www.phpbenchmarks.com? -You will find lot of benchmarks for PHP frameworks and template engines. +You will find a lot of benchmarks for PHP and PHP libraries on [phpbenchmarks.com](http://www.phpbenchmarks.com). -You can compare results between Apache Bench and Siege, and PHP 5.6 to 7.2. +Benchmarks results are available from PHP 5.6 to latest version. -## What is this repository ? +Our benchmarking protocol is available on [benchmarking protocol page](http://www.phpbenchmarks.com/en/documentation/benchmarking-protocol). -It's benchmark common code for PHP benchmarks. +## What is this repository? -Switch branch to select your PHP major version and benchmark you want to see. +It contains PHP benchmark code. -See all PHP benchmarked versions on [phpbenchmarks/php](https://github.com/phpbenchmarks/php). - -You can find how we benchmark on [phpbenchmarks.com](http://www.phpbenchmarks.com/en/benchmark-protocol.html). +Switch branch to select version and benchmark you want to see. ## Benchmarks -You can find all PHP benchmarks results on [phpbenchmarks.com](http://www.phpbenchmarks.com/en/benchmark/php.html). +You can find PHP 7.1 benchmarks results on +[benchmarks results page](http://www.phpbenchmarks.com/en/benchmark/php/7.1). + +See all PHP benchmarked versions on [select version page](http://www.phpbenchmarks.com/en/benchmark/php/version). + +## Community + +Go to [community page](http://www.phpbenchmarks.com/en/community) to see the Hall of fame, or download the benchmark kit to add your code! + +## How version works? + +We do not follow semantic version for this repository. + +Here is an explanation about our versioning system: + +`X.Y.Z_benchmark-slug_W` -Scores are too low ? Do not hesitate to create a pull request, and ask a new benchmark ! +* `X`: PHP major version. +* `Y`: PHP minor version. +* `Z`: PHP patch version. +* `benchmark-slug`: slug of the benchmark, list available on [documentation page](http://www.phpbenchmarks.com/en/documentation). +* `W`: benchmark version diff --git a/composer.json b/composer.json index 2875d5e..5514d11 100644 --- a/composer.json +++ b/composer.json @@ -3,6 +3,6 @@ "license": "proprietary", "type": "project", "require": { - "php": "7.1.*" + "php": "7.1.33" } -} +} \ No newline at end of file diff --git a/init_benchmark.sh b/init_benchmark.sh deleted file mode 100755 index 9ee4ef3..0000000 --- a/init_benchmark.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -function init() { - composer install --no-dev --classmap-authoritative - [ "$?" != "0" ] && exit 1 - - return 0 -} diff --git a/public/index.php b/public/index.php index 3a77bcd..9319f13 100644 --- a/public/index.php +++ b/public/index.php @@ -5,14 +5,14 @@ declare(strict_types=1); // Simulate an extends -include(__DIR__ . '/../overload/layout_start.php'); +include(__DIR__ . '/../templates/layout/layout_start.php'); ?>
@@ -4036,7 +4036,7 @@ // Create 1000 macros and call them all // ------------------------------------------------------------------------------------------------------------- - require __DIR__ . '/../overload/macros.php'; + require __DIR__ . '/../src/macros.php'; ?>
@@ -91221,2502 +91221,2502 @@ public function phpBenchmarks(): string @@ -93726,7 +93726,5 @@ public function phpBenchmarks(): string diff --git a/public/benchmark_generator.php b/src/benchmark_generator.php similarity index 100% rename from public/benchmark_generator.php rename to src/benchmark_generator.php diff --git a/overload/blocks.php b/src/blocks.php similarity index 100% rename from overload/blocks.php rename to src/blocks.php diff --git a/overload/functions.php b/src/functions.php similarity index 100% rename from overload/functions.php rename to src/functions.php diff --git a/overload/macros.php b/src/macros.php similarity index 100% rename from overload/macros.php rename to src/macros.php diff --git a/overload/layout_end.php b/templates/layout/layout_end.php similarity index 100% rename from overload/layout_end.php rename to templates/layout/layout_end.php diff --git a/overload/layout_start.php b/templates/layout/layout_start.php similarity index 93% rename from overload/layout_start.php rename to templates/layout/layout_start.php index 8b935e6..0bff673 100644 --- a/overload/layout_start.php +++ b/templates/layout/layout_start.php @@ -4,7 +4,7 @@ - Small overload benchmark + Big overload benchmark
diff --git a/overload/templates/template1.php b/templates/template/template1.php similarity index 100% rename from overload/templates/template1.php rename to templates/template/template1.php diff --git a/overload/templates/template10.php b/templates/template/template10.php similarity index 100% rename from overload/templates/template10.php rename to templates/template/template10.php diff --git a/overload/templates/template100.php b/templates/template/template100.php similarity index 100% rename from overload/templates/template100.php rename to templates/template/template100.php diff --git a/overload/templates/template101.php b/templates/template/template101.php similarity index 100% rename from overload/templates/template101.php rename to templates/template/template101.php diff --git a/overload/templates/template102.php b/templates/template/template102.php similarity index 100% rename from overload/templates/template102.php rename to templates/template/template102.php diff --git a/overload/templates/template103.php b/templates/template/template103.php similarity index 100% rename from overload/templates/template103.php rename to templates/template/template103.php diff --git a/overload/templates/template104.php b/templates/template/template104.php similarity index 100% rename from overload/templates/template104.php rename to templates/template/template104.php diff --git a/overload/templates/template105.php b/templates/template/template105.php similarity index 100% rename from overload/templates/template105.php rename to templates/template/template105.php diff --git a/overload/templates/template106.php b/templates/template/template106.php similarity index 100% rename from overload/templates/template106.php rename to templates/template/template106.php diff --git a/overload/templates/template107.php b/templates/template/template107.php similarity index 100% rename from overload/templates/template107.php rename to templates/template/template107.php diff --git a/overload/templates/template108.php b/templates/template/template108.php similarity index 100% rename from overload/templates/template108.php rename to templates/template/template108.php diff --git a/overload/templates/template109.php b/templates/template/template109.php similarity index 100% rename from overload/templates/template109.php rename to templates/template/template109.php diff --git a/overload/templates/template11.php b/templates/template/template11.php similarity index 100% rename from overload/templates/template11.php rename to templates/template/template11.php diff --git a/overload/templates/template110.php b/templates/template/template110.php similarity index 100% rename from overload/templates/template110.php rename to templates/template/template110.php diff --git a/overload/templates/template111.php b/templates/template/template111.php similarity index 100% rename from overload/templates/template111.php rename to templates/template/template111.php diff --git a/overload/templates/template112.php b/templates/template/template112.php similarity index 100% rename from overload/templates/template112.php rename to templates/template/template112.php diff --git a/overload/templates/template113.php b/templates/template/template113.php similarity index 100% rename from overload/templates/template113.php rename to templates/template/template113.php diff --git a/overload/templates/template114.php b/templates/template/template114.php similarity index 100% rename from overload/templates/template114.php rename to templates/template/template114.php diff --git a/overload/templates/template115.php b/templates/template/template115.php similarity index 100% rename from overload/templates/template115.php rename to templates/template/template115.php diff --git a/overload/templates/template116.php b/templates/template/template116.php similarity index 100% rename from overload/templates/template116.php rename to templates/template/template116.php diff --git a/overload/templates/template117.php b/templates/template/template117.php similarity index 100% rename from overload/templates/template117.php rename to templates/template/template117.php diff --git a/overload/templates/template118.php b/templates/template/template118.php similarity index 100% rename from overload/templates/template118.php rename to templates/template/template118.php diff --git a/overload/templates/template119.php b/templates/template/template119.php similarity index 100% rename from overload/templates/template119.php rename to templates/template/template119.php diff --git a/overload/templates/template12.php b/templates/template/template12.php similarity index 100% rename from overload/templates/template12.php rename to templates/template/template12.php diff --git a/overload/templates/template120.php b/templates/template/template120.php similarity index 100% rename from overload/templates/template120.php rename to templates/template/template120.php diff --git a/overload/templates/template121.php b/templates/template/template121.php similarity index 100% rename from overload/templates/template121.php rename to templates/template/template121.php diff --git a/overload/templates/template122.php b/templates/template/template122.php similarity index 100% rename from overload/templates/template122.php rename to templates/template/template122.php diff --git a/overload/templates/template123.php b/templates/template/template123.php similarity index 100% rename from overload/templates/template123.php rename to templates/template/template123.php diff --git a/overload/templates/template124.php b/templates/template/template124.php similarity index 100% rename from overload/templates/template124.php rename to templates/template/template124.php diff --git a/overload/templates/template125.php b/templates/template/template125.php similarity index 100% rename from overload/templates/template125.php rename to templates/template/template125.php diff --git a/overload/templates/template126.php b/templates/template/template126.php similarity index 100% rename from overload/templates/template126.php rename to templates/template/template126.php diff --git a/overload/templates/template127.php b/templates/template/template127.php similarity index 100% rename from overload/templates/template127.php rename to templates/template/template127.php diff --git a/overload/templates/template128.php b/templates/template/template128.php similarity index 100% rename from overload/templates/template128.php rename to templates/template/template128.php diff --git a/overload/templates/template129.php b/templates/template/template129.php similarity index 100% rename from overload/templates/template129.php rename to templates/template/template129.php diff --git a/overload/templates/template13.php b/templates/template/template13.php similarity index 100% rename from overload/templates/template13.php rename to templates/template/template13.php diff --git a/overload/templates/template130.php b/templates/template/template130.php similarity index 100% rename from overload/templates/template130.php rename to templates/template/template130.php diff --git a/overload/templates/template131.php b/templates/template/template131.php similarity index 100% rename from overload/templates/template131.php rename to templates/template/template131.php diff --git a/overload/templates/template132.php b/templates/template/template132.php similarity index 100% rename from overload/templates/template132.php rename to templates/template/template132.php diff --git a/overload/templates/template133.php b/templates/template/template133.php similarity index 100% rename from overload/templates/template133.php rename to templates/template/template133.php diff --git a/overload/templates/template134.php b/templates/template/template134.php similarity index 100% rename from overload/templates/template134.php rename to templates/template/template134.php diff --git a/overload/templates/template135.php b/templates/template/template135.php similarity index 100% rename from overload/templates/template135.php rename to templates/template/template135.php diff --git a/overload/templates/template136.php b/templates/template/template136.php similarity index 100% rename from overload/templates/template136.php rename to templates/template/template136.php diff --git a/overload/templates/template137.php b/templates/template/template137.php similarity index 100% rename from overload/templates/template137.php rename to templates/template/template137.php diff --git a/overload/templates/template138.php b/templates/template/template138.php similarity index 100% rename from overload/templates/template138.php rename to templates/template/template138.php diff --git a/overload/templates/template139.php b/templates/template/template139.php similarity index 100% rename from overload/templates/template139.php rename to templates/template/template139.php diff --git a/overload/templates/template14.php b/templates/template/template14.php similarity index 100% rename from overload/templates/template14.php rename to templates/template/template14.php diff --git a/overload/templates/template140.php b/templates/template/template140.php similarity index 100% rename from overload/templates/template140.php rename to templates/template/template140.php diff --git a/overload/templates/template141.php b/templates/template/template141.php similarity index 100% rename from overload/templates/template141.php rename to templates/template/template141.php diff --git a/overload/templates/template142.php b/templates/template/template142.php similarity index 100% rename from overload/templates/template142.php rename to templates/template/template142.php diff --git a/overload/templates/template143.php b/templates/template/template143.php similarity index 100% rename from overload/templates/template143.php rename to templates/template/template143.php diff --git a/overload/templates/template144.php b/templates/template/template144.php similarity index 100% rename from overload/templates/template144.php rename to templates/template/template144.php diff --git a/overload/templates/template145.php b/templates/template/template145.php similarity index 100% rename from overload/templates/template145.php rename to templates/template/template145.php diff --git a/overload/templates/template146.php b/templates/template/template146.php similarity index 100% rename from overload/templates/template146.php rename to templates/template/template146.php diff --git a/overload/templates/template147.php b/templates/template/template147.php similarity index 100% rename from overload/templates/template147.php rename to templates/template/template147.php diff --git a/overload/templates/template148.php b/templates/template/template148.php similarity index 100% rename from overload/templates/template148.php rename to templates/template/template148.php diff --git a/overload/templates/template149.php b/templates/template/template149.php similarity index 100% rename from overload/templates/template149.php rename to templates/template/template149.php diff --git a/overload/templates/template15.php b/templates/template/template15.php similarity index 100% rename from overload/templates/template15.php rename to templates/template/template15.php diff --git a/overload/templates/template150.php b/templates/template/template150.php similarity index 100% rename from overload/templates/template150.php rename to templates/template/template150.php diff --git a/overload/templates/template151.php b/templates/template/template151.php similarity index 100% rename from overload/templates/template151.php rename to templates/template/template151.php diff --git a/overload/templates/template152.php b/templates/template/template152.php similarity index 100% rename from overload/templates/template152.php rename to templates/template/template152.php diff --git a/overload/templates/template153.php b/templates/template/template153.php similarity index 100% rename from overload/templates/template153.php rename to templates/template/template153.php diff --git a/overload/templates/template154.php b/templates/template/template154.php similarity index 100% rename from overload/templates/template154.php rename to templates/template/template154.php diff --git a/overload/templates/template155.php b/templates/template/template155.php similarity index 100% rename from overload/templates/template155.php rename to templates/template/template155.php diff --git a/overload/templates/template156.php b/templates/template/template156.php similarity index 100% rename from overload/templates/template156.php rename to templates/template/template156.php diff --git a/overload/templates/template157.php b/templates/template/template157.php similarity index 100% rename from overload/templates/template157.php rename to templates/template/template157.php diff --git a/overload/templates/template158.php b/templates/template/template158.php similarity index 100% rename from overload/templates/template158.php rename to templates/template/template158.php diff --git a/overload/templates/template159.php b/templates/template/template159.php similarity index 100% rename from overload/templates/template159.php rename to templates/template/template159.php diff --git a/overload/templates/template16.php b/templates/template/template16.php similarity index 100% rename from overload/templates/template16.php rename to templates/template/template16.php diff --git a/overload/templates/template160.php b/templates/template/template160.php similarity index 100% rename from overload/templates/template160.php rename to templates/template/template160.php diff --git a/overload/templates/template161.php b/templates/template/template161.php similarity index 100% rename from overload/templates/template161.php rename to templates/template/template161.php diff --git a/overload/templates/template162.php b/templates/template/template162.php similarity index 100% rename from overload/templates/template162.php rename to templates/template/template162.php diff --git a/overload/templates/template163.php b/templates/template/template163.php similarity index 100% rename from overload/templates/template163.php rename to templates/template/template163.php diff --git a/overload/templates/template164.php b/templates/template/template164.php similarity index 100% rename from overload/templates/template164.php rename to templates/template/template164.php diff --git a/overload/templates/template165.php b/templates/template/template165.php similarity index 100% rename from overload/templates/template165.php rename to templates/template/template165.php diff --git a/overload/templates/template166.php b/templates/template/template166.php similarity index 100% rename from overload/templates/template166.php rename to templates/template/template166.php diff --git a/overload/templates/template167.php b/templates/template/template167.php similarity index 100% rename from overload/templates/template167.php rename to templates/template/template167.php diff --git a/overload/templates/template168.php b/templates/template/template168.php similarity index 100% rename from overload/templates/template168.php rename to templates/template/template168.php diff --git a/overload/templates/template169.php b/templates/template/template169.php similarity index 100% rename from overload/templates/template169.php rename to templates/template/template169.php diff --git a/overload/templates/template17.php b/templates/template/template17.php similarity index 100% rename from overload/templates/template17.php rename to templates/template/template17.php diff --git a/overload/templates/template170.php b/templates/template/template170.php similarity index 100% rename from overload/templates/template170.php rename to templates/template/template170.php diff --git a/overload/templates/template171.php b/templates/template/template171.php similarity index 100% rename from overload/templates/template171.php rename to templates/template/template171.php diff --git a/overload/templates/template172.php b/templates/template/template172.php similarity index 100% rename from overload/templates/template172.php rename to templates/template/template172.php diff --git a/overload/templates/template173.php b/templates/template/template173.php similarity index 100% rename from overload/templates/template173.php rename to templates/template/template173.php diff --git a/overload/templates/template174.php b/templates/template/template174.php similarity index 100% rename from overload/templates/template174.php rename to templates/template/template174.php diff --git a/overload/templates/template175.php b/templates/template/template175.php similarity index 100% rename from overload/templates/template175.php rename to templates/template/template175.php diff --git a/overload/templates/template176.php b/templates/template/template176.php similarity index 100% rename from overload/templates/template176.php rename to templates/template/template176.php diff --git a/overload/templates/template177.php b/templates/template/template177.php similarity index 100% rename from overload/templates/template177.php rename to templates/template/template177.php diff --git a/overload/templates/template178.php b/templates/template/template178.php similarity index 100% rename from overload/templates/template178.php rename to templates/template/template178.php diff --git a/overload/templates/template179.php b/templates/template/template179.php similarity index 100% rename from overload/templates/template179.php rename to templates/template/template179.php diff --git a/overload/templates/template18.php b/templates/template/template18.php similarity index 100% rename from overload/templates/template18.php rename to templates/template/template18.php diff --git a/overload/templates/template180.php b/templates/template/template180.php similarity index 100% rename from overload/templates/template180.php rename to templates/template/template180.php diff --git a/overload/templates/template181.php b/templates/template/template181.php similarity index 100% rename from overload/templates/template181.php rename to templates/template/template181.php diff --git a/overload/templates/template182.php b/templates/template/template182.php similarity index 100% rename from overload/templates/template182.php rename to templates/template/template182.php diff --git a/overload/templates/template183.php b/templates/template/template183.php similarity index 100% rename from overload/templates/template183.php rename to templates/template/template183.php diff --git a/overload/templates/template184.php b/templates/template/template184.php similarity index 100% rename from overload/templates/template184.php rename to templates/template/template184.php diff --git a/overload/templates/template185.php b/templates/template/template185.php similarity index 100% rename from overload/templates/template185.php rename to templates/template/template185.php diff --git a/overload/templates/template186.php b/templates/template/template186.php similarity index 100% rename from overload/templates/template186.php rename to templates/template/template186.php diff --git a/overload/templates/template187.php b/templates/template/template187.php similarity index 100% rename from overload/templates/template187.php rename to templates/template/template187.php diff --git a/overload/templates/template188.php b/templates/template/template188.php similarity index 100% rename from overload/templates/template188.php rename to templates/template/template188.php diff --git a/overload/templates/template189.php b/templates/template/template189.php similarity index 100% rename from overload/templates/template189.php rename to templates/template/template189.php diff --git a/overload/templates/template19.php b/templates/template/template19.php similarity index 100% rename from overload/templates/template19.php rename to templates/template/template19.php diff --git a/overload/templates/template190.php b/templates/template/template190.php similarity index 100% rename from overload/templates/template190.php rename to templates/template/template190.php diff --git a/overload/templates/template191.php b/templates/template/template191.php similarity index 100% rename from overload/templates/template191.php rename to templates/template/template191.php diff --git a/overload/templates/template192.php b/templates/template/template192.php similarity index 100% rename from overload/templates/template192.php rename to templates/template/template192.php diff --git a/overload/templates/template193.php b/templates/template/template193.php similarity index 100% rename from overload/templates/template193.php rename to templates/template/template193.php diff --git a/overload/templates/template194.php b/templates/template/template194.php similarity index 100% rename from overload/templates/template194.php rename to templates/template/template194.php diff --git a/overload/templates/template195.php b/templates/template/template195.php similarity index 100% rename from overload/templates/template195.php rename to templates/template/template195.php diff --git a/overload/templates/template196.php b/templates/template/template196.php similarity index 100% rename from overload/templates/template196.php rename to templates/template/template196.php diff --git a/overload/templates/template197.php b/templates/template/template197.php similarity index 100% rename from overload/templates/template197.php rename to templates/template/template197.php diff --git a/overload/templates/template198.php b/templates/template/template198.php similarity index 100% rename from overload/templates/template198.php rename to templates/template/template198.php diff --git a/overload/templates/template199.php b/templates/template/template199.php similarity index 100% rename from overload/templates/template199.php rename to templates/template/template199.php diff --git a/overload/templates/template2.php b/templates/template/template2.php similarity index 100% rename from overload/templates/template2.php rename to templates/template/template2.php diff --git a/overload/templates/template20.php b/templates/template/template20.php similarity index 100% rename from overload/templates/template20.php rename to templates/template/template20.php diff --git a/overload/templates/template200.php b/templates/template/template200.php similarity index 100% rename from overload/templates/template200.php rename to templates/template/template200.php diff --git a/overload/templates/template201.php b/templates/template/template201.php similarity index 100% rename from overload/templates/template201.php rename to templates/template/template201.php diff --git a/overload/templates/template202.php b/templates/template/template202.php similarity index 100% rename from overload/templates/template202.php rename to templates/template/template202.php diff --git a/overload/templates/template203.php b/templates/template/template203.php similarity index 100% rename from overload/templates/template203.php rename to templates/template/template203.php diff --git a/overload/templates/template204.php b/templates/template/template204.php similarity index 100% rename from overload/templates/template204.php rename to templates/template/template204.php diff --git a/overload/templates/template205.php b/templates/template/template205.php similarity index 100% rename from overload/templates/template205.php rename to templates/template/template205.php diff --git a/overload/templates/template206.php b/templates/template/template206.php similarity index 100% rename from overload/templates/template206.php rename to templates/template/template206.php diff --git a/overload/templates/template207.php b/templates/template/template207.php similarity index 100% rename from overload/templates/template207.php rename to templates/template/template207.php diff --git a/overload/templates/template208.php b/templates/template/template208.php similarity index 100% rename from overload/templates/template208.php rename to templates/template/template208.php diff --git a/overload/templates/template209.php b/templates/template/template209.php similarity index 100% rename from overload/templates/template209.php rename to templates/template/template209.php diff --git a/overload/templates/template21.php b/templates/template/template21.php similarity index 100% rename from overload/templates/template21.php rename to templates/template/template21.php diff --git a/overload/templates/template210.php b/templates/template/template210.php similarity index 100% rename from overload/templates/template210.php rename to templates/template/template210.php diff --git a/overload/templates/template211.php b/templates/template/template211.php similarity index 100% rename from overload/templates/template211.php rename to templates/template/template211.php diff --git a/overload/templates/template212.php b/templates/template/template212.php similarity index 100% rename from overload/templates/template212.php rename to templates/template/template212.php diff --git a/overload/templates/template213.php b/templates/template/template213.php similarity index 100% rename from overload/templates/template213.php rename to templates/template/template213.php diff --git a/overload/templates/template214.php b/templates/template/template214.php similarity index 100% rename from overload/templates/template214.php rename to templates/template/template214.php diff --git a/overload/templates/template215.php b/templates/template/template215.php similarity index 100% rename from overload/templates/template215.php rename to templates/template/template215.php diff --git a/overload/templates/template216.php b/templates/template/template216.php similarity index 100% rename from overload/templates/template216.php rename to templates/template/template216.php diff --git a/overload/templates/template217.php b/templates/template/template217.php similarity index 100% rename from overload/templates/template217.php rename to templates/template/template217.php diff --git a/overload/templates/template218.php b/templates/template/template218.php similarity index 100% rename from overload/templates/template218.php rename to templates/template/template218.php diff --git a/overload/templates/template219.php b/templates/template/template219.php similarity index 100% rename from overload/templates/template219.php rename to templates/template/template219.php diff --git a/overload/templates/template22.php b/templates/template/template22.php similarity index 100% rename from overload/templates/template22.php rename to templates/template/template22.php diff --git a/overload/templates/template220.php b/templates/template/template220.php similarity index 100% rename from overload/templates/template220.php rename to templates/template/template220.php diff --git a/overload/templates/template221.php b/templates/template/template221.php similarity index 100% rename from overload/templates/template221.php rename to templates/template/template221.php diff --git a/overload/templates/template222.php b/templates/template/template222.php similarity index 100% rename from overload/templates/template222.php rename to templates/template/template222.php diff --git a/overload/templates/template223.php b/templates/template/template223.php similarity index 100% rename from overload/templates/template223.php rename to templates/template/template223.php diff --git a/overload/templates/template224.php b/templates/template/template224.php similarity index 100% rename from overload/templates/template224.php rename to templates/template/template224.php diff --git a/overload/templates/template225.php b/templates/template/template225.php similarity index 100% rename from overload/templates/template225.php rename to templates/template/template225.php diff --git a/overload/templates/template226.php b/templates/template/template226.php similarity index 100% rename from overload/templates/template226.php rename to templates/template/template226.php diff --git a/overload/templates/template227.php b/templates/template/template227.php similarity index 100% rename from overload/templates/template227.php rename to templates/template/template227.php diff --git a/overload/templates/template228.php b/templates/template/template228.php similarity index 100% rename from overload/templates/template228.php rename to templates/template/template228.php diff --git a/overload/templates/template229.php b/templates/template/template229.php similarity index 100% rename from overload/templates/template229.php rename to templates/template/template229.php diff --git a/overload/templates/template23.php b/templates/template/template23.php similarity index 100% rename from overload/templates/template23.php rename to templates/template/template23.php diff --git a/overload/templates/template230.php b/templates/template/template230.php similarity index 100% rename from overload/templates/template230.php rename to templates/template/template230.php diff --git a/overload/templates/template231.php b/templates/template/template231.php similarity index 100% rename from overload/templates/template231.php rename to templates/template/template231.php diff --git a/overload/templates/template232.php b/templates/template/template232.php similarity index 100% rename from overload/templates/template232.php rename to templates/template/template232.php diff --git a/overload/templates/template233.php b/templates/template/template233.php similarity index 100% rename from overload/templates/template233.php rename to templates/template/template233.php diff --git a/overload/templates/template234.php b/templates/template/template234.php similarity index 100% rename from overload/templates/template234.php rename to templates/template/template234.php diff --git a/overload/templates/template235.php b/templates/template/template235.php similarity index 100% rename from overload/templates/template235.php rename to templates/template/template235.php diff --git a/overload/templates/template236.php b/templates/template/template236.php similarity index 100% rename from overload/templates/template236.php rename to templates/template/template236.php diff --git a/overload/templates/template237.php b/templates/template/template237.php similarity index 100% rename from overload/templates/template237.php rename to templates/template/template237.php diff --git a/overload/templates/template238.php b/templates/template/template238.php similarity index 100% rename from overload/templates/template238.php rename to templates/template/template238.php diff --git a/overload/templates/template239.php b/templates/template/template239.php similarity index 100% rename from overload/templates/template239.php rename to templates/template/template239.php diff --git a/overload/templates/template24.php b/templates/template/template24.php similarity index 100% rename from overload/templates/template24.php rename to templates/template/template24.php diff --git a/overload/templates/template240.php b/templates/template/template240.php similarity index 100% rename from overload/templates/template240.php rename to templates/template/template240.php diff --git a/overload/templates/template241.php b/templates/template/template241.php similarity index 100% rename from overload/templates/template241.php rename to templates/template/template241.php diff --git a/overload/templates/template242.php b/templates/template/template242.php similarity index 100% rename from overload/templates/template242.php rename to templates/template/template242.php diff --git a/overload/templates/template243.php b/templates/template/template243.php similarity index 100% rename from overload/templates/template243.php rename to templates/template/template243.php diff --git a/overload/templates/template244.php b/templates/template/template244.php similarity index 100% rename from overload/templates/template244.php rename to templates/template/template244.php diff --git a/overload/templates/template245.php b/templates/template/template245.php similarity index 100% rename from overload/templates/template245.php rename to templates/template/template245.php diff --git a/overload/templates/template246.php b/templates/template/template246.php similarity index 100% rename from overload/templates/template246.php rename to templates/template/template246.php diff --git a/overload/templates/template247.php b/templates/template/template247.php similarity index 100% rename from overload/templates/template247.php rename to templates/template/template247.php diff --git a/overload/templates/template248.php b/templates/template/template248.php similarity index 100% rename from overload/templates/template248.php rename to templates/template/template248.php diff --git a/overload/templates/template249.php b/templates/template/template249.php similarity index 100% rename from overload/templates/template249.php rename to templates/template/template249.php diff --git a/overload/templates/template25.php b/templates/template/template25.php similarity index 100% rename from overload/templates/template25.php rename to templates/template/template25.php diff --git a/overload/templates/template250.php b/templates/template/template250.php similarity index 100% rename from overload/templates/template250.php rename to templates/template/template250.php diff --git a/overload/templates/template251.php b/templates/template/template251.php similarity index 100% rename from overload/templates/template251.php rename to templates/template/template251.php diff --git a/overload/templates/template252.php b/templates/template/template252.php similarity index 100% rename from overload/templates/template252.php rename to templates/template/template252.php diff --git a/overload/templates/template253.php b/templates/template/template253.php similarity index 100% rename from overload/templates/template253.php rename to templates/template/template253.php diff --git a/overload/templates/template254.php b/templates/template/template254.php similarity index 100% rename from overload/templates/template254.php rename to templates/template/template254.php diff --git a/overload/templates/template255.php b/templates/template/template255.php similarity index 100% rename from overload/templates/template255.php rename to templates/template/template255.php diff --git a/overload/templates/template256.php b/templates/template/template256.php similarity index 100% rename from overload/templates/template256.php rename to templates/template/template256.php diff --git a/overload/templates/template257.php b/templates/template/template257.php similarity index 100% rename from overload/templates/template257.php rename to templates/template/template257.php diff --git a/overload/templates/template258.php b/templates/template/template258.php similarity index 100% rename from overload/templates/template258.php rename to templates/template/template258.php diff --git a/overload/templates/template259.php b/templates/template/template259.php similarity index 100% rename from overload/templates/template259.php rename to templates/template/template259.php diff --git a/overload/templates/template26.php b/templates/template/template26.php similarity index 100% rename from overload/templates/template26.php rename to templates/template/template26.php diff --git a/overload/templates/template260.php b/templates/template/template260.php similarity index 100% rename from overload/templates/template260.php rename to templates/template/template260.php diff --git a/overload/templates/template261.php b/templates/template/template261.php similarity index 100% rename from overload/templates/template261.php rename to templates/template/template261.php diff --git a/overload/templates/template262.php b/templates/template/template262.php similarity index 100% rename from overload/templates/template262.php rename to templates/template/template262.php diff --git a/overload/templates/template263.php b/templates/template/template263.php similarity index 100% rename from overload/templates/template263.php rename to templates/template/template263.php diff --git a/overload/templates/template264.php b/templates/template/template264.php similarity index 100% rename from overload/templates/template264.php rename to templates/template/template264.php diff --git a/overload/templates/template265.php b/templates/template/template265.php similarity index 100% rename from overload/templates/template265.php rename to templates/template/template265.php diff --git a/overload/templates/template266.php b/templates/template/template266.php similarity index 100% rename from overload/templates/template266.php rename to templates/template/template266.php diff --git a/overload/templates/template267.php b/templates/template/template267.php similarity index 100% rename from overload/templates/template267.php rename to templates/template/template267.php diff --git a/overload/templates/template268.php b/templates/template/template268.php similarity index 100% rename from overload/templates/template268.php rename to templates/template/template268.php diff --git a/overload/templates/template269.php b/templates/template/template269.php similarity index 100% rename from overload/templates/template269.php rename to templates/template/template269.php diff --git a/overload/templates/template27.php b/templates/template/template27.php similarity index 100% rename from overload/templates/template27.php rename to templates/template/template27.php diff --git a/overload/templates/template270.php b/templates/template/template270.php similarity index 100% rename from overload/templates/template270.php rename to templates/template/template270.php diff --git a/overload/templates/template271.php b/templates/template/template271.php similarity index 100% rename from overload/templates/template271.php rename to templates/template/template271.php diff --git a/overload/templates/template272.php b/templates/template/template272.php similarity index 100% rename from overload/templates/template272.php rename to templates/template/template272.php diff --git a/overload/templates/template273.php b/templates/template/template273.php similarity index 100% rename from overload/templates/template273.php rename to templates/template/template273.php diff --git a/overload/templates/template274.php b/templates/template/template274.php similarity index 100% rename from overload/templates/template274.php rename to templates/template/template274.php diff --git a/overload/templates/template275.php b/templates/template/template275.php similarity index 100% rename from overload/templates/template275.php rename to templates/template/template275.php diff --git a/overload/templates/template276.php b/templates/template/template276.php similarity index 100% rename from overload/templates/template276.php rename to templates/template/template276.php diff --git a/overload/templates/template277.php b/templates/template/template277.php similarity index 100% rename from overload/templates/template277.php rename to templates/template/template277.php diff --git a/overload/templates/template278.php b/templates/template/template278.php similarity index 100% rename from overload/templates/template278.php rename to templates/template/template278.php diff --git a/overload/templates/template279.php b/templates/template/template279.php similarity index 100% rename from overload/templates/template279.php rename to templates/template/template279.php diff --git a/overload/templates/template28.php b/templates/template/template28.php similarity index 100% rename from overload/templates/template28.php rename to templates/template/template28.php diff --git a/overload/templates/template280.php b/templates/template/template280.php similarity index 100% rename from overload/templates/template280.php rename to templates/template/template280.php diff --git a/overload/templates/template281.php b/templates/template/template281.php similarity index 100% rename from overload/templates/template281.php rename to templates/template/template281.php diff --git a/overload/templates/template282.php b/templates/template/template282.php similarity index 100% rename from overload/templates/template282.php rename to templates/template/template282.php diff --git a/overload/templates/template283.php b/templates/template/template283.php similarity index 100% rename from overload/templates/template283.php rename to templates/template/template283.php diff --git a/overload/templates/template284.php b/templates/template/template284.php similarity index 100% rename from overload/templates/template284.php rename to templates/template/template284.php diff --git a/overload/templates/template285.php b/templates/template/template285.php similarity index 100% rename from overload/templates/template285.php rename to templates/template/template285.php diff --git a/overload/templates/template286.php b/templates/template/template286.php similarity index 100% rename from overload/templates/template286.php rename to templates/template/template286.php diff --git a/overload/templates/template287.php b/templates/template/template287.php similarity index 100% rename from overload/templates/template287.php rename to templates/template/template287.php diff --git a/overload/templates/template288.php b/templates/template/template288.php similarity index 100% rename from overload/templates/template288.php rename to templates/template/template288.php diff --git a/overload/templates/template289.php b/templates/template/template289.php similarity index 100% rename from overload/templates/template289.php rename to templates/template/template289.php diff --git a/overload/templates/template29.php b/templates/template/template29.php similarity index 100% rename from overload/templates/template29.php rename to templates/template/template29.php diff --git a/overload/templates/template290.php b/templates/template/template290.php similarity index 100% rename from overload/templates/template290.php rename to templates/template/template290.php diff --git a/overload/templates/template291.php b/templates/template/template291.php similarity index 100% rename from overload/templates/template291.php rename to templates/template/template291.php diff --git a/overload/templates/template292.php b/templates/template/template292.php similarity index 100% rename from overload/templates/template292.php rename to templates/template/template292.php diff --git a/overload/templates/template293.php b/templates/template/template293.php similarity index 100% rename from overload/templates/template293.php rename to templates/template/template293.php diff --git a/overload/templates/template294.php b/templates/template/template294.php similarity index 100% rename from overload/templates/template294.php rename to templates/template/template294.php diff --git a/overload/templates/template295.php b/templates/template/template295.php similarity index 100% rename from overload/templates/template295.php rename to templates/template/template295.php diff --git a/overload/templates/template296.php b/templates/template/template296.php similarity index 100% rename from overload/templates/template296.php rename to templates/template/template296.php diff --git a/overload/templates/template297.php b/templates/template/template297.php similarity index 100% rename from overload/templates/template297.php rename to templates/template/template297.php diff --git a/overload/templates/template298.php b/templates/template/template298.php similarity index 100% rename from overload/templates/template298.php rename to templates/template/template298.php diff --git a/overload/templates/template299.php b/templates/template/template299.php similarity index 100% rename from overload/templates/template299.php rename to templates/template/template299.php diff --git a/overload/templates/template3.php b/templates/template/template3.php similarity index 100% rename from overload/templates/template3.php rename to templates/template/template3.php diff --git a/overload/templates/template30.php b/templates/template/template30.php similarity index 100% rename from overload/templates/template30.php rename to templates/template/template30.php diff --git a/overload/templates/template300.php b/templates/template/template300.php similarity index 100% rename from overload/templates/template300.php rename to templates/template/template300.php diff --git a/overload/templates/template301.php b/templates/template/template301.php similarity index 100% rename from overload/templates/template301.php rename to templates/template/template301.php diff --git a/overload/templates/template302.php b/templates/template/template302.php similarity index 100% rename from overload/templates/template302.php rename to templates/template/template302.php diff --git a/overload/templates/template303.php b/templates/template/template303.php similarity index 100% rename from overload/templates/template303.php rename to templates/template/template303.php diff --git a/overload/templates/template304.php b/templates/template/template304.php similarity index 100% rename from overload/templates/template304.php rename to templates/template/template304.php diff --git a/overload/templates/template305.php b/templates/template/template305.php similarity index 100% rename from overload/templates/template305.php rename to templates/template/template305.php diff --git a/overload/templates/template306.php b/templates/template/template306.php similarity index 100% rename from overload/templates/template306.php rename to templates/template/template306.php diff --git a/overload/templates/template307.php b/templates/template/template307.php similarity index 100% rename from overload/templates/template307.php rename to templates/template/template307.php diff --git a/overload/templates/template308.php b/templates/template/template308.php similarity index 100% rename from overload/templates/template308.php rename to templates/template/template308.php diff --git a/overload/templates/template309.php b/templates/template/template309.php similarity index 100% rename from overload/templates/template309.php rename to templates/template/template309.php diff --git a/overload/templates/template31.php b/templates/template/template31.php similarity index 100% rename from overload/templates/template31.php rename to templates/template/template31.php diff --git a/overload/templates/template310.php b/templates/template/template310.php similarity index 100% rename from overload/templates/template310.php rename to templates/template/template310.php diff --git a/overload/templates/template311.php b/templates/template/template311.php similarity index 100% rename from overload/templates/template311.php rename to templates/template/template311.php diff --git a/overload/templates/template312.php b/templates/template/template312.php similarity index 100% rename from overload/templates/template312.php rename to templates/template/template312.php diff --git a/overload/templates/template313.php b/templates/template/template313.php similarity index 100% rename from overload/templates/template313.php rename to templates/template/template313.php diff --git a/overload/templates/template314.php b/templates/template/template314.php similarity index 100% rename from overload/templates/template314.php rename to templates/template/template314.php diff --git a/overload/templates/template315.php b/templates/template/template315.php similarity index 100% rename from overload/templates/template315.php rename to templates/template/template315.php diff --git a/overload/templates/template316.php b/templates/template/template316.php similarity index 100% rename from overload/templates/template316.php rename to templates/template/template316.php diff --git a/overload/templates/template317.php b/templates/template/template317.php similarity index 100% rename from overload/templates/template317.php rename to templates/template/template317.php diff --git a/overload/templates/template318.php b/templates/template/template318.php similarity index 100% rename from overload/templates/template318.php rename to templates/template/template318.php diff --git a/overload/templates/template319.php b/templates/template/template319.php similarity index 100% rename from overload/templates/template319.php rename to templates/template/template319.php diff --git a/overload/templates/template32.php b/templates/template/template32.php similarity index 100% rename from overload/templates/template32.php rename to templates/template/template32.php diff --git a/overload/templates/template320.php b/templates/template/template320.php similarity index 100% rename from overload/templates/template320.php rename to templates/template/template320.php diff --git a/overload/templates/template321.php b/templates/template/template321.php similarity index 100% rename from overload/templates/template321.php rename to templates/template/template321.php diff --git a/overload/templates/template322.php b/templates/template/template322.php similarity index 100% rename from overload/templates/template322.php rename to templates/template/template322.php diff --git a/overload/templates/template323.php b/templates/template/template323.php similarity index 100% rename from overload/templates/template323.php rename to templates/template/template323.php diff --git a/overload/templates/template324.php b/templates/template/template324.php similarity index 100% rename from overload/templates/template324.php rename to templates/template/template324.php diff --git a/overload/templates/template325.php b/templates/template/template325.php similarity index 100% rename from overload/templates/template325.php rename to templates/template/template325.php diff --git a/overload/templates/template326.php b/templates/template/template326.php similarity index 100% rename from overload/templates/template326.php rename to templates/template/template326.php diff --git a/overload/templates/template327.php b/templates/template/template327.php similarity index 100% rename from overload/templates/template327.php rename to templates/template/template327.php diff --git a/overload/templates/template328.php b/templates/template/template328.php similarity index 100% rename from overload/templates/template328.php rename to templates/template/template328.php diff --git a/overload/templates/template329.php b/templates/template/template329.php similarity index 100% rename from overload/templates/template329.php rename to templates/template/template329.php diff --git a/overload/templates/template33.php b/templates/template/template33.php similarity index 100% rename from overload/templates/template33.php rename to templates/template/template33.php diff --git a/overload/templates/template330.php b/templates/template/template330.php similarity index 100% rename from overload/templates/template330.php rename to templates/template/template330.php diff --git a/overload/templates/template331.php b/templates/template/template331.php similarity index 100% rename from overload/templates/template331.php rename to templates/template/template331.php diff --git a/overload/templates/template332.php b/templates/template/template332.php similarity index 100% rename from overload/templates/template332.php rename to templates/template/template332.php diff --git a/overload/templates/template333.php b/templates/template/template333.php similarity index 100% rename from overload/templates/template333.php rename to templates/template/template333.php diff --git a/overload/templates/template334.php b/templates/template/template334.php similarity index 100% rename from overload/templates/template334.php rename to templates/template/template334.php diff --git a/overload/templates/template335.php b/templates/template/template335.php similarity index 100% rename from overload/templates/template335.php rename to templates/template/template335.php diff --git a/overload/templates/template336.php b/templates/template/template336.php similarity index 100% rename from overload/templates/template336.php rename to templates/template/template336.php diff --git a/overload/templates/template337.php b/templates/template/template337.php similarity index 100% rename from overload/templates/template337.php rename to templates/template/template337.php diff --git a/overload/templates/template338.php b/templates/template/template338.php similarity index 100% rename from overload/templates/template338.php rename to templates/template/template338.php diff --git a/overload/templates/template339.php b/templates/template/template339.php similarity index 100% rename from overload/templates/template339.php rename to templates/template/template339.php diff --git a/overload/templates/template34.php b/templates/template/template34.php similarity index 100% rename from overload/templates/template34.php rename to templates/template/template34.php diff --git a/overload/templates/template340.php b/templates/template/template340.php similarity index 100% rename from overload/templates/template340.php rename to templates/template/template340.php diff --git a/overload/templates/template341.php b/templates/template/template341.php similarity index 100% rename from overload/templates/template341.php rename to templates/template/template341.php diff --git a/overload/templates/template342.php b/templates/template/template342.php similarity index 100% rename from overload/templates/template342.php rename to templates/template/template342.php diff --git a/overload/templates/template343.php b/templates/template/template343.php similarity index 100% rename from overload/templates/template343.php rename to templates/template/template343.php diff --git a/overload/templates/template344.php b/templates/template/template344.php similarity index 100% rename from overload/templates/template344.php rename to templates/template/template344.php diff --git a/overload/templates/template345.php b/templates/template/template345.php similarity index 100% rename from overload/templates/template345.php rename to templates/template/template345.php diff --git a/overload/templates/template346.php b/templates/template/template346.php similarity index 100% rename from overload/templates/template346.php rename to templates/template/template346.php diff --git a/overload/templates/template347.php b/templates/template/template347.php similarity index 100% rename from overload/templates/template347.php rename to templates/template/template347.php diff --git a/overload/templates/template348.php b/templates/template/template348.php similarity index 100% rename from overload/templates/template348.php rename to templates/template/template348.php diff --git a/overload/templates/template349.php b/templates/template/template349.php similarity index 100% rename from overload/templates/template349.php rename to templates/template/template349.php diff --git a/overload/templates/template35.php b/templates/template/template35.php similarity index 100% rename from overload/templates/template35.php rename to templates/template/template35.php diff --git a/overload/templates/template350.php b/templates/template/template350.php similarity index 100% rename from overload/templates/template350.php rename to templates/template/template350.php diff --git a/overload/templates/template351.php b/templates/template/template351.php similarity index 100% rename from overload/templates/template351.php rename to templates/template/template351.php diff --git a/overload/templates/template352.php b/templates/template/template352.php similarity index 100% rename from overload/templates/template352.php rename to templates/template/template352.php diff --git a/overload/templates/template353.php b/templates/template/template353.php similarity index 100% rename from overload/templates/template353.php rename to templates/template/template353.php diff --git a/overload/templates/template354.php b/templates/template/template354.php similarity index 100% rename from overload/templates/template354.php rename to templates/template/template354.php diff --git a/overload/templates/template355.php b/templates/template/template355.php similarity index 100% rename from overload/templates/template355.php rename to templates/template/template355.php diff --git a/overload/templates/template356.php b/templates/template/template356.php similarity index 100% rename from overload/templates/template356.php rename to templates/template/template356.php diff --git a/overload/templates/template357.php b/templates/template/template357.php similarity index 100% rename from overload/templates/template357.php rename to templates/template/template357.php diff --git a/overload/templates/template358.php b/templates/template/template358.php similarity index 100% rename from overload/templates/template358.php rename to templates/template/template358.php diff --git a/overload/templates/template359.php b/templates/template/template359.php similarity index 100% rename from overload/templates/template359.php rename to templates/template/template359.php diff --git a/overload/templates/template36.php b/templates/template/template36.php similarity index 100% rename from overload/templates/template36.php rename to templates/template/template36.php diff --git a/overload/templates/template360.php b/templates/template/template360.php similarity index 100% rename from overload/templates/template360.php rename to templates/template/template360.php diff --git a/overload/templates/template361.php b/templates/template/template361.php similarity index 100% rename from overload/templates/template361.php rename to templates/template/template361.php diff --git a/overload/templates/template362.php b/templates/template/template362.php similarity index 100% rename from overload/templates/template362.php rename to templates/template/template362.php diff --git a/overload/templates/template363.php b/templates/template/template363.php similarity index 100% rename from overload/templates/template363.php rename to templates/template/template363.php diff --git a/overload/templates/template364.php b/templates/template/template364.php similarity index 100% rename from overload/templates/template364.php rename to templates/template/template364.php diff --git a/overload/templates/template365.php b/templates/template/template365.php similarity index 100% rename from overload/templates/template365.php rename to templates/template/template365.php diff --git a/overload/templates/template366.php b/templates/template/template366.php similarity index 100% rename from overload/templates/template366.php rename to templates/template/template366.php diff --git a/overload/templates/template367.php b/templates/template/template367.php similarity index 100% rename from overload/templates/template367.php rename to templates/template/template367.php diff --git a/overload/templates/template368.php b/templates/template/template368.php similarity index 100% rename from overload/templates/template368.php rename to templates/template/template368.php diff --git a/overload/templates/template369.php b/templates/template/template369.php similarity index 100% rename from overload/templates/template369.php rename to templates/template/template369.php diff --git a/overload/templates/template37.php b/templates/template/template37.php similarity index 100% rename from overload/templates/template37.php rename to templates/template/template37.php diff --git a/overload/templates/template370.php b/templates/template/template370.php similarity index 100% rename from overload/templates/template370.php rename to templates/template/template370.php diff --git a/overload/templates/template371.php b/templates/template/template371.php similarity index 100% rename from overload/templates/template371.php rename to templates/template/template371.php diff --git a/overload/templates/template372.php b/templates/template/template372.php similarity index 100% rename from overload/templates/template372.php rename to templates/template/template372.php diff --git a/overload/templates/template373.php b/templates/template/template373.php similarity index 100% rename from overload/templates/template373.php rename to templates/template/template373.php diff --git a/overload/templates/template374.php b/templates/template/template374.php similarity index 100% rename from overload/templates/template374.php rename to templates/template/template374.php diff --git a/overload/templates/template375.php b/templates/template/template375.php similarity index 100% rename from overload/templates/template375.php rename to templates/template/template375.php diff --git a/overload/templates/template376.php b/templates/template/template376.php similarity index 100% rename from overload/templates/template376.php rename to templates/template/template376.php diff --git a/overload/templates/template377.php b/templates/template/template377.php similarity index 100% rename from overload/templates/template377.php rename to templates/template/template377.php diff --git a/overload/templates/template378.php b/templates/template/template378.php similarity index 100% rename from overload/templates/template378.php rename to templates/template/template378.php diff --git a/overload/templates/template379.php b/templates/template/template379.php similarity index 100% rename from overload/templates/template379.php rename to templates/template/template379.php diff --git a/overload/templates/template38.php b/templates/template/template38.php similarity index 100% rename from overload/templates/template38.php rename to templates/template/template38.php diff --git a/overload/templates/template380.php b/templates/template/template380.php similarity index 100% rename from overload/templates/template380.php rename to templates/template/template380.php diff --git a/overload/templates/template381.php b/templates/template/template381.php similarity index 100% rename from overload/templates/template381.php rename to templates/template/template381.php diff --git a/overload/templates/template382.php b/templates/template/template382.php similarity index 100% rename from overload/templates/template382.php rename to templates/template/template382.php diff --git a/overload/templates/template383.php b/templates/template/template383.php similarity index 100% rename from overload/templates/template383.php rename to templates/template/template383.php diff --git a/overload/templates/template384.php b/templates/template/template384.php similarity index 100% rename from overload/templates/template384.php rename to templates/template/template384.php diff --git a/overload/templates/template385.php b/templates/template/template385.php similarity index 100% rename from overload/templates/template385.php rename to templates/template/template385.php diff --git a/overload/templates/template386.php b/templates/template/template386.php similarity index 100% rename from overload/templates/template386.php rename to templates/template/template386.php diff --git a/overload/templates/template387.php b/templates/template/template387.php similarity index 100% rename from overload/templates/template387.php rename to templates/template/template387.php diff --git a/overload/templates/template388.php b/templates/template/template388.php similarity index 100% rename from overload/templates/template388.php rename to templates/template/template388.php diff --git a/overload/templates/template389.php b/templates/template/template389.php similarity index 100% rename from overload/templates/template389.php rename to templates/template/template389.php diff --git a/overload/templates/template39.php b/templates/template/template39.php similarity index 100% rename from overload/templates/template39.php rename to templates/template/template39.php diff --git a/overload/templates/template390.php b/templates/template/template390.php similarity index 100% rename from overload/templates/template390.php rename to templates/template/template390.php diff --git a/overload/templates/template391.php b/templates/template/template391.php similarity index 100% rename from overload/templates/template391.php rename to templates/template/template391.php diff --git a/overload/templates/template392.php b/templates/template/template392.php similarity index 100% rename from overload/templates/template392.php rename to templates/template/template392.php diff --git a/overload/templates/template393.php b/templates/template/template393.php similarity index 100% rename from overload/templates/template393.php rename to templates/template/template393.php diff --git a/overload/templates/template394.php b/templates/template/template394.php similarity index 100% rename from overload/templates/template394.php rename to templates/template/template394.php diff --git a/overload/templates/template395.php b/templates/template/template395.php similarity index 100% rename from overload/templates/template395.php rename to templates/template/template395.php diff --git a/overload/templates/template396.php b/templates/template/template396.php similarity index 100% rename from overload/templates/template396.php rename to templates/template/template396.php diff --git a/overload/templates/template397.php b/templates/template/template397.php similarity index 100% rename from overload/templates/template397.php rename to templates/template/template397.php diff --git a/overload/templates/template398.php b/templates/template/template398.php similarity index 100% rename from overload/templates/template398.php rename to templates/template/template398.php diff --git a/overload/templates/template399.php b/templates/template/template399.php similarity index 100% rename from overload/templates/template399.php rename to templates/template/template399.php diff --git a/overload/templates/template4.php b/templates/template/template4.php similarity index 100% rename from overload/templates/template4.php rename to templates/template/template4.php diff --git a/overload/templates/template40.php b/templates/template/template40.php similarity index 100% rename from overload/templates/template40.php rename to templates/template/template40.php diff --git a/overload/templates/template400.php b/templates/template/template400.php similarity index 100% rename from overload/templates/template400.php rename to templates/template/template400.php diff --git a/overload/templates/template401.php b/templates/template/template401.php similarity index 100% rename from overload/templates/template401.php rename to templates/template/template401.php diff --git a/overload/templates/template402.php b/templates/template/template402.php similarity index 100% rename from overload/templates/template402.php rename to templates/template/template402.php diff --git a/overload/templates/template403.php b/templates/template/template403.php similarity index 100% rename from overload/templates/template403.php rename to templates/template/template403.php diff --git a/overload/templates/template404.php b/templates/template/template404.php similarity index 100% rename from overload/templates/template404.php rename to templates/template/template404.php diff --git a/overload/templates/template405.php b/templates/template/template405.php similarity index 100% rename from overload/templates/template405.php rename to templates/template/template405.php diff --git a/overload/templates/template406.php b/templates/template/template406.php similarity index 100% rename from overload/templates/template406.php rename to templates/template/template406.php diff --git a/overload/templates/template407.php b/templates/template/template407.php similarity index 100% rename from overload/templates/template407.php rename to templates/template/template407.php diff --git a/overload/templates/template408.php b/templates/template/template408.php similarity index 100% rename from overload/templates/template408.php rename to templates/template/template408.php diff --git a/overload/templates/template409.php b/templates/template/template409.php similarity index 100% rename from overload/templates/template409.php rename to templates/template/template409.php diff --git a/overload/templates/template41.php b/templates/template/template41.php similarity index 100% rename from overload/templates/template41.php rename to templates/template/template41.php diff --git a/overload/templates/template410.php b/templates/template/template410.php similarity index 100% rename from overload/templates/template410.php rename to templates/template/template410.php diff --git a/overload/templates/template411.php b/templates/template/template411.php similarity index 100% rename from overload/templates/template411.php rename to templates/template/template411.php diff --git a/overload/templates/template412.php b/templates/template/template412.php similarity index 100% rename from overload/templates/template412.php rename to templates/template/template412.php diff --git a/overload/templates/template413.php b/templates/template/template413.php similarity index 100% rename from overload/templates/template413.php rename to templates/template/template413.php diff --git a/overload/templates/template414.php b/templates/template/template414.php similarity index 100% rename from overload/templates/template414.php rename to templates/template/template414.php diff --git a/overload/templates/template415.php b/templates/template/template415.php similarity index 100% rename from overload/templates/template415.php rename to templates/template/template415.php diff --git a/overload/templates/template416.php b/templates/template/template416.php similarity index 100% rename from overload/templates/template416.php rename to templates/template/template416.php diff --git a/overload/templates/template417.php b/templates/template/template417.php similarity index 100% rename from overload/templates/template417.php rename to templates/template/template417.php diff --git a/overload/templates/template418.php b/templates/template/template418.php similarity index 100% rename from overload/templates/template418.php rename to templates/template/template418.php diff --git a/overload/templates/template419.php b/templates/template/template419.php similarity index 100% rename from overload/templates/template419.php rename to templates/template/template419.php diff --git a/overload/templates/template42.php b/templates/template/template42.php similarity index 100% rename from overload/templates/template42.php rename to templates/template/template42.php diff --git a/overload/templates/template420.php b/templates/template/template420.php similarity index 100% rename from overload/templates/template420.php rename to templates/template/template420.php diff --git a/overload/templates/template421.php b/templates/template/template421.php similarity index 100% rename from overload/templates/template421.php rename to templates/template/template421.php diff --git a/overload/templates/template422.php b/templates/template/template422.php similarity index 100% rename from overload/templates/template422.php rename to templates/template/template422.php diff --git a/overload/templates/template423.php b/templates/template/template423.php similarity index 100% rename from overload/templates/template423.php rename to templates/template/template423.php diff --git a/overload/templates/template424.php b/templates/template/template424.php similarity index 100% rename from overload/templates/template424.php rename to templates/template/template424.php diff --git a/overload/templates/template425.php b/templates/template/template425.php similarity index 100% rename from overload/templates/template425.php rename to templates/template/template425.php diff --git a/overload/templates/template426.php b/templates/template/template426.php similarity index 100% rename from overload/templates/template426.php rename to templates/template/template426.php diff --git a/overload/templates/template427.php b/templates/template/template427.php similarity index 100% rename from overload/templates/template427.php rename to templates/template/template427.php diff --git a/overload/templates/template428.php b/templates/template/template428.php similarity index 100% rename from overload/templates/template428.php rename to templates/template/template428.php diff --git a/overload/templates/template429.php b/templates/template/template429.php similarity index 100% rename from overload/templates/template429.php rename to templates/template/template429.php diff --git a/overload/templates/template43.php b/templates/template/template43.php similarity index 100% rename from overload/templates/template43.php rename to templates/template/template43.php diff --git a/overload/templates/template430.php b/templates/template/template430.php similarity index 100% rename from overload/templates/template430.php rename to templates/template/template430.php diff --git a/overload/templates/template431.php b/templates/template/template431.php similarity index 100% rename from overload/templates/template431.php rename to templates/template/template431.php diff --git a/overload/templates/template432.php b/templates/template/template432.php similarity index 100% rename from overload/templates/template432.php rename to templates/template/template432.php diff --git a/overload/templates/template433.php b/templates/template/template433.php similarity index 100% rename from overload/templates/template433.php rename to templates/template/template433.php diff --git a/overload/templates/template434.php b/templates/template/template434.php similarity index 100% rename from overload/templates/template434.php rename to templates/template/template434.php diff --git a/overload/templates/template435.php b/templates/template/template435.php similarity index 100% rename from overload/templates/template435.php rename to templates/template/template435.php diff --git a/overload/templates/template436.php b/templates/template/template436.php similarity index 100% rename from overload/templates/template436.php rename to templates/template/template436.php diff --git a/overload/templates/template437.php b/templates/template/template437.php similarity index 100% rename from overload/templates/template437.php rename to templates/template/template437.php diff --git a/overload/templates/template438.php b/templates/template/template438.php similarity index 100% rename from overload/templates/template438.php rename to templates/template/template438.php diff --git a/overload/templates/template439.php b/templates/template/template439.php similarity index 100% rename from overload/templates/template439.php rename to templates/template/template439.php diff --git a/overload/templates/template44.php b/templates/template/template44.php similarity index 100% rename from overload/templates/template44.php rename to templates/template/template44.php diff --git a/overload/templates/template440.php b/templates/template/template440.php similarity index 100% rename from overload/templates/template440.php rename to templates/template/template440.php diff --git a/overload/templates/template441.php b/templates/template/template441.php similarity index 100% rename from overload/templates/template441.php rename to templates/template/template441.php diff --git a/overload/templates/template442.php b/templates/template/template442.php similarity index 100% rename from overload/templates/template442.php rename to templates/template/template442.php diff --git a/overload/templates/template443.php b/templates/template/template443.php similarity index 100% rename from overload/templates/template443.php rename to templates/template/template443.php diff --git a/overload/templates/template444.php b/templates/template/template444.php similarity index 100% rename from overload/templates/template444.php rename to templates/template/template444.php diff --git a/overload/templates/template445.php b/templates/template/template445.php similarity index 100% rename from overload/templates/template445.php rename to templates/template/template445.php diff --git a/overload/templates/template446.php b/templates/template/template446.php similarity index 100% rename from overload/templates/template446.php rename to templates/template/template446.php diff --git a/overload/templates/template447.php b/templates/template/template447.php similarity index 100% rename from overload/templates/template447.php rename to templates/template/template447.php diff --git a/overload/templates/template448.php b/templates/template/template448.php similarity index 100% rename from overload/templates/template448.php rename to templates/template/template448.php diff --git a/overload/templates/template449.php b/templates/template/template449.php similarity index 100% rename from overload/templates/template449.php rename to templates/template/template449.php diff --git a/overload/templates/template45.php b/templates/template/template45.php similarity index 100% rename from overload/templates/template45.php rename to templates/template/template45.php diff --git a/overload/templates/template450.php b/templates/template/template450.php similarity index 100% rename from overload/templates/template450.php rename to templates/template/template450.php diff --git a/overload/templates/template451.php b/templates/template/template451.php similarity index 100% rename from overload/templates/template451.php rename to templates/template/template451.php diff --git a/overload/templates/template452.php b/templates/template/template452.php similarity index 100% rename from overload/templates/template452.php rename to templates/template/template452.php diff --git a/overload/templates/template453.php b/templates/template/template453.php similarity index 100% rename from overload/templates/template453.php rename to templates/template/template453.php diff --git a/overload/templates/template454.php b/templates/template/template454.php similarity index 100% rename from overload/templates/template454.php rename to templates/template/template454.php diff --git a/overload/templates/template455.php b/templates/template/template455.php similarity index 100% rename from overload/templates/template455.php rename to templates/template/template455.php diff --git a/overload/templates/template456.php b/templates/template/template456.php similarity index 100% rename from overload/templates/template456.php rename to templates/template/template456.php diff --git a/overload/templates/template457.php b/templates/template/template457.php similarity index 100% rename from overload/templates/template457.php rename to templates/template/template457.php diff --git a/overload/templates/template458.php b/templates/template/template458.php similarity index 100% rename from overload/templates/template458.php rename to templates/template/template458.php diff --git a/overload/templates/template459.php b/templates/template/template459.php similarity index 100% rename from overload/templates/template459.php rename to templates/template/template459.php diff --git a/overload/templates/template46.php b/templates/template/template46.php similarity index 100% rename from overload/templates/template46.php rename to templates/template/template46.php diff --git a/overload/templates/template460.php b/templates/template/template460.php similarity index 100% rename from overload/templates/template460.php rename to templates/template/template460.php diff --git a/overload/templates/template461.php b/templates/template/template461.php similarity index 100% rename from overload/templates/template461.php rename to templates/template/template461.php diff --git a/overload/templates/template462.php b/templates/template/template462.php similarity index 100% rename from overload/templates/template462.php rename to templates/template/template462.php diff --git a/overload/templates/template463.php b/templates/template/template463.php similarity index 100% rename from overload/templates/template463.php rename to templates/template/template463.php diff --git a/overload/templates/template464.php b/templates/template/template464.php similarity index 100% rename from overload/templates/template464.php rename to templates/template/template464.php diff --git a/overload/templates/template465.php b/templates/template/template465.php similarity index 100% rename from overload/templates/template465.php rename to templates/template/template465.php diff --git a/overload/templates/template466.php b/templates/template/template466.php similarity index 100% rename from overload/templates/template466.php rename to templates/template/template466.php diff --git a/overload/templates/template467.php b/templates/template/template467.php similarity index 100% rename from overload/templates/template467.php rename to templates/template/template467.php diff --git a/overload/templates/template468.php b/templates/template/template468.php similarity index 100% rename from overload/templates/template468.php rename to templates/template/template468.php diff --git a/overload/templates/template469.php b/templates/template/template469.php similarity index 100% rename from overload/templates/template469.php rename to templates/template/template469.php diff --git a/overload/templates/template47.php b/templates/template/template47.php similarity index 100% rename from overload/templates/template47.php rename to templates/template/template47.php diff --git a/overload/templates/template470.php b/templates/template/template470.php similarity index 100% rename from overload/templates/template470.php rename to templates/template/template470.php diff --git a/overload/templates/template471.php b/templates/template/template471.php similarity index 100% rename from overload/templates/template471.php rename to templates/template/template471.php diff --git a/overload/templates/template472.php b/templates/template/template472.php similarity index 100% rename from overload/templates/template472.php rename to templates/template/template472.php diff --git a/overload/templates/template473.php b/templates/template/template473.php similarity index 100% rename from overload/templates/template473.php rename to templates/template/template473.php diff --git a/overload/templates/template474.php b/templates/template/template474.php similarity index 100% rename from overload/templates/template474.php rename to templates/template/template474.php diff --git a/overload/templates/template475.php b/templates/template/template475.php similarity index 100% rename from overload/templates/template475.php rename to templates/template/template475.php diff --git a/overload/templates/template476.php b/templates/template/template476.php similarity index 100% rename from overload/templates/template476.php rename to templates/template/template476.php diff --git a/overload/templates/template477.php b/templates/template/template477.php similarity index 100% rename from overload/templates/template477.php rename to templates/template/template477.php diff --git a/overload/templates/template478.php b/templates/template/template478.php similarity index 100% rename from overload/templates/template478.php rename to templates/template/template478.php diff --git a/overload/templates/template479.php b/templates/template/template479.php similarity index 100% rename from overload/templates/template479.php rename to templates/template/template479.php diff --git a/overload/templates/template48.php b/templates/template/template48.php similarity index 100% rename from overload/templates/template48.php rename to templates/template/template48.php diff --git a/overload/templates/template480.php b/templates/template/template480.php similarity index 100% rename from overload/templates/template480.php rename to templates/template/template480.php diff --git a/overload/templates/template481.php b/templates/template/template481.php similarity index 100% rename from overload/templates/template481.php rename to templates/template/template481.php diff --git a/overload/templates/template482.php b/templates/template/template482.php similarity index 100% rename from overload/templates/template482.php rename to templates/template/template482.php diff --git a/overload/templates/template483.php b/templates/template/template483.php similarity index 100% rename from overload/templates/template483.php rename to templates/template/template483.php diff --git a/overload/templates/template484.php b/templates/template/template484.php similarity index 100% rename from overload/templates/template484.php rename to templates/template/template484.php diff --git a/overload/templates/template485.php b/templates/template/template485.php similarity index 100% rename from overload/templates/template485.php rename to templates/template/template485.php diff --git a/overload/templates/template486.php b/templates/template/template486.php similarity index 100% rename from overload/templates/template486.php rename to templates/template/template486.php diff --git a/overload/templates/template487.php b/templates/template/template487.php similarity index 100% rename from overload/templates/template487.php rename to templates/template/template487.php diff --git a/overload/templates/template488.php b/templates/template/template488.php similarity index 100% rename from overload/templates/template488.php rename to templates/template/template488.php diff --git a/overload/templates/template489.php b/templates/template/template489.php similarity index 100% rename from overload/templates/template489.php rename to templates/template/template489.php diff --git a/overload/templates/template49.php b/templates/template/template49.php similarity index 100% rename from overload/templates/template49.php rename to templates/template/template49.php diff --git a/overload/templates/template490.php b/templates/template/template490.php similarity index 100% rename from overload/templates/template490.php rename to templates/template/template490.php diff --git a/overload/templates/template491.php b/templates/template/template491.php similarity index 100% rename from overload/templates/template491.php rename to templates/template/template491.php diff --git a/overload/templates/template492.php b/templates/template/template492.php similarity index 100% rename from overload/templates/template492.php rename to templates/template/template492.php diff --git a/overload/templates/template493.php b/templates/template/template493.php similarity index 100% rename from overload/templates/template493.php rename to templates/template/template493.php diff --git a/overload/templates/template494.php b/templates/template/template494.php similarity index 100% rename from overload/templates/template494.php rename to templates/template/template494.php diff --git a/overload/templates/template495.php b/templates/template/template495.php similarity index 100% rename from overload/templates/template495.php rename to templates/template/template495.php diff --git a/overload/templates/template496.php b/templates/template/template496.php similarity index 100% rename from overload/templates/template496.php rename to templates/template/template496.php diff --git a/overload/templates/template497.php b/templates/template/template497.php similarity index 100% rename from overload/templates/template497.php rename to templates/template/template497.php diff --git a/overload/templates/template498.php b/templates/template/template498.php similarity index 100% rename from overload/templates/template498.php rename to templates/template/template498.php diff --git a/overload/templates/template499.php b/templates/template/template499.php similarity index 100% rename from overload/templates/template499.php rename to templates/template/template499.php diff --git a/overload/templates/template5.php b/templates/template/template5.php similarity index 100% rename from overload/templates/template5.php rename to templates/template/template5.php diff --git a/overload/templates/template50.php b/templates/template/template50.php similarity index 100% rename from overload/templates/template50.php rename to templates/template/template50.php diff --git a/overload/templates/template500.php b/templates/template/template500.php similarity index 100% rename from overload/templates/template500.php rename to templates/template/template500.php diff --git a/overload/templates/template51.php b/templates/template/template51.php similarity index 100% rename from overload/templates/template51.php rename to templates/template/template51.php diff --git a/overload/templates/template52.php b/templates/template/template52.php similarity index 100% rename from overload/templates/template52.php rename to templates/template/template52.php diff --git a/overload/templates/template53.php b/templates/template/template53.php similarity index 100% rename from overload/templates/template53.php rename to templates/template/template53.php diff --git a/overload/templates/template54.php b/templates/template/template54.php similarity index 100% rename from overload/templates/template54.php rename to templates/template/template54.php diff --git a/overload/templates/template55.php b/templates/template/template55.php similarity index 100% rename from overload/templates/template55.php rename to templates/template/template55.php diff --git a/overload/templates/template56.php b/templates/template/template56.php similarity index 100% rename from overload/templates/template56.php rename to templates/template/template56.php diff --git a/overload/templates/template57.php b/templates/template/template57.php similarity index 100% rename from overload/templates/template57.php rename to templates/template/template57.php diff --git a/overload/templates/template58.php b/templates/template/template58.php similarity index 100% rename from overload/templates/template58.php rename to templates/template/template58.php diff --git a/overload/templates/template59.php b/templates/template/template59.php similarity index 100% rename from overload/templates/template59.php rename to templates/template/template59.php diff --git a/overload/templates/template6.php b/templates/template/template6.php similarity index 100% rename from overload/templates/template6.php rename to templates/template/template6.php diff --git a/overload/templates/template60.php b/templates/template/template60.php similarity index 100% rename from overload/templates/template60.php rename to templates/template/template60.php diff --git a/overload/templates/template61.php b/templates/template/template61.php similarity index 100% rename from overload/templates/template61.php rename to templates/template/template61.php diff --git a/overload/templates/template62.php b/templates/template/template62.php similarity index 100% rename from overload/templates/template62.php rename to templates/template/template62.php diff --git a/overload/templates/template63.php b/templates/template/template63.php similarity index 100% rename from overload/templates/template63.php rename to templates/template/template63.php diff --git a/overload/templates/template64.php b/templates/template/template64.php similarity index 100% rename from overload/templates/template64.php rename to templates/template/template64.php diff --git a/overload/templates/template65.php b/templates/template/template65.php similarity index 100% rename from overload/templates/template65.php rename to templates/template/template65.php diff --git a/overload/templates/template66.php b/templates/template/template66.php similarity index 100% rename from overload/templates/template66.php rename to templates/template/template66.php diff --git a/overload/templates/template67.php b/templates/template/template67.php similarity index 100% rename from overload/templates/template67.php rename to templates/template/template67.php diff --git a/overload/templates/template68.php b/templates/template/template68.php similarity index 100% rename from overload/templates/template68.php rename to templates/template/template68.php diff --git a/overload/templates/template69.php b/templates/template/template69.php similarity index 100% rename from overload/templates/template69.php rename to templates/template/template69.php diff --git a/overload/templates/template7.php b/templates/template/template7.php similarity index 100% rename from overload/templates/template7.php rename to templates/template/template7.php diff --git a/overload/templates/template70.php b/templates/template/template70.php similarity index 100% rename from overload/templates/template70.php rename to templates/template/template70.php diff --git a/overload/templates/template71.php b/templates/template/template71.php similarity index 100% rename from overload/templates/template71.php rename to templates/template/template71.php diff --git a/overload/templates/template72.php b/templates/template/template72.php similarity index 100% rename from overload/templates/template72.php rename to templates/template/template72.php diff --git a/overload/templates/template73.php b/templates/template/template73.php similarity index 100% rename from overload/templates/template73.php rename to templates/template/template73.php diff --git a/overload/templates/template74.php b/templates/template/template74.php similarity index 100% rename from overload/templates/template74.php rename to templates/template/template74.php diff --git a/overload/templates/template75.php b/templates/template/template75.php similarity index 100% rename from overload/templates/template75.php rename to templates/template/template75.php diff --git a/overload/templates/template76.php b/templates/template/template76.php similarity index 100% rename from overload/templates/template76.php rename to templates/template/template76.php diff --git a/overload/templates/template77.php b/templates/template/template77.php similarity index 100% rename from overload/templates/template77.php rename to templates/template/template77.php diff --git a/overload/templates/template78.php b/templates/template/template78.php similarity index 100% rename from overload/templates/template78.php rename to templates/template/template78.php diff --git a/overload/templates/template79.php b/templates/template/template79.php similarity index 100% rename from overload/templates/template79.php rename to templates/template/template79.php diff --git a/overload/templates/template8.php b/templates/template/template8.php similarity index 100% rename from overload/templates/template8.php rename to templates/template/template8.php diff --git a/overload/templates/template80.php b/templates/template/template80.php similarity index 100% rename from overload/templates/template80.php rename to templates/template/template80.php diff --git a/overload/templates/template81.php b/templates/template/template81.php similarity index 100% rename from overload/templates/template81.php rename to templates/template/template81.php diff --git a/overload/templates/template82.php b/templates/template/template82.php similarity index 100% rename from overload/templates/template82.php rename to templates/template/template82.php diff --git a/overload/templates/template83.php b/templates/template/template83.php similarity index 100% rename from overload/templates/template83.php rename to templates/template/template83.php diff --git a/overload/templates/template84.php b/templates/template/template84.php similarity index 100% rename from overload/templates/template84.php rename to templates/template/template84.php diff --git a/overload/templates/template85.php b/templates/template/template85.php similarity index 100% rename from overload/templates/template85.php rename to templates/template/template85.php diff --git a/overload/templates/template86.php b/templates/template/template86.php similarity index 100% rename from overload/templates/template86.php rename to templates/template/template86.php diff --git a/overload/templates/template87.php b/templates/template/template87.php similarity index 100% rename from overload/templates/template87.php rename to templates/template/template87.php diff --git a/overload/templates/template88.php b/templates/template/template88.php similarity index 100% rename from overload/templates/template88.php rename to templates/template/template88.php diff --git a/overload/templates/template89.php b/templates/template/template89.php similarity index 100% rename from overload/templates/template89.php rename to templates/template/template89.php diff --git a/overload/templates/template9.php b/templates/template/template9.php similarity index 100% rename from overload/templates/template9.php rename to templates/template/template9.php diff --git a/overload/templates/template90.php b/templates/template/template90.php similarity index 100% rename from overload/templates/template90.php rename to templates/template/template90.php diff --git a/overload/templates/template91.php b/templates/template/template91.php similarity index 100% rename from overload/templates/template91.php rename to templates/template/template91.php diff --git a/overload/templates/template92.php b/templates/template/template92.php similarity index 100% rename from overload/templates/template92.php rename to templates/template/template92.php diff --git a/overload/templates/template93.php b/templates/template/template93.php similarity index 100% rename from overload/templates/template93.php rename to templates/template/template93.php diff --git a/overload/templates/template94.php b/templates/template/template94.php similarity index 100% rename from overload/templates/template94.php rename to templates/template/template94.php diff --git a/overload/templates/template95.php b/templates/template/template95.php similarity index 100% rename from overload/templates/template95.php rename to templates/template/template95.php diff --git a/overload/templates/template96.php b/templates/template/template96.php similarity index 100% rename from overload/templates/template96.php rename to templates/template/template96.php diff --git a/overload/templates/template97.php b/templates/template/template97.php similarity index 100% rename from overload/templates/template97.php rename to templates/template/template97.php diff --git a/overload/templates/template98.php b/templates/template/template98.php similarity index 100% rename from overload/templates/template98.php rename to templates/template/template98.php diff --git a/overload/templates/template99.php b/templates/template/template99.php similarity index 100% rename from overload/templates/template99.php rename to templates/template/template99.php