diff --git a/module/metric/calc/global/hour/consume_of_annual_closed_project.php b/module/metric/calc/system/hour/consume_of_annual_closed_project.php similarity index 100% rename from module/metric/calc/global/hour/consume_of_annual_closed_project.php rename to module/metric/calc/system/hour/consume_of_annual_closed_project.php diff --git a/module/metric/calc/global/hour/consume_of_monthly_closed_project.php b/module/metric/calc/system/hour/consume_of_monthly_closed_project.php similarity index 100% rename from module/metric/calc/global/hour/consume_of_monthly_closed_project.php rename to module/metric/calc/system/hour/consume_of_monthly_closed_project.php diff --git a/module/metric/calc/global/hour/day_of_annual_closed_project.php b/module/metric/calc/system/hour/day_of_annual_closed_project.php similarity index 100% rename from module/metric/calc/global/hour/day_of_annual_closed_project.php rename to module/metric/calc/system/hour/day_of_annual_closed_project.php diff --git a/module/metric/calc/global/hour/day_of_annual_effort.php b/module/metric/calc/system/hour/day_of_annual_effort.php similarity index 100% rename from module/metric/calc/global/hour/day_of_annual_effort.php rename to module/metric/calc/system/hour/day_of_annual_effort.php diff --git a/module/metric/calc/global/hour/day_of_daily_effort.php b/module/metric/calc/system/hour/day_of_daily_effort.php similarity index 100% rename from module/metric/calc/global/hour/day_of_daily_effort.php rename to module/metric/calc/system/hour/day_of_daily_effort.php diff --git a/module/metric/calc/global/hour/estimate_of_annual_closed_project.php b/module/metric/calc/system/hour/estimate_of_annual_closed_project.php similarity index 100% rename from module/metric/calc/global/hour/estimate_of_annual_closed_project.php rename to module/metric/calc/system/hour/estimate_of_annual_closed_project.php diff --git a/module/metric/calc/global/hour/hour_of_annual_effort.php b/module/metric/calc/system/hour/hour_of_annual_effort.php similarity index 100% rename from module/metric/calc/global/hour/hour_of_annual_effort.php rename to module/metric/calc/system/hour/hour_of_annual_effort.php diff --git a/module/metric/calc/global/hour/hour_of_daily_effort.php b/module/metric/calc/system/hour/hour_of_daily_effort.php similarity index 100% rename from module/metric/calc/global/hour/hour_of_daily_effort.php rename to module/metric/calc/system/hour/hour_of_daily_effort.php diff --git a/module/metric/calc/global/rate/rate_of_annual_delivered_story.php b/module/metric/calc/system/rate/rate_of_annual_delivered_story.php similarity index 100% rename from module/metric/calc/global/rate/rate_of_annual_delivered_story.php rename to module/metric/calc/system/rate/rate_of_annual_delivered_story.php diff --git a/module/metric/calc/global/rate/rate_of_annual_finished_story.php b/module/metric/calc/system/rate/rate_of_annual_finished_story.php similarity index 100% rename from module/metric/calc/global/rate/rate_of_annual_finished_story.php rename to module/metric/calc/system/rate/rate_of_annual_finished_story.php diff --git a/module/metric/calc/global/rate/rate_of_delayed_closed_execution_which_annual_finished.php b/module/metric/calc/system/rate/rate_of_delayed_closed_execution_which_annual_finished.php similarity index 100% rename from module/metric/calc/global/rate/rate_of_delayed_closed_execution_which_annual_finished.php rename to module/metric/calc/system/rate/rate_of_delayed_closed_execution_which_annual_finished.php diff --git a/module/metric/calc/global/rate/rate_of_delayed_finished_project_which_annual_finished.php b/module/metric/calc/system/rate/rate_of_delayed_finished_project_which_annual_finished.php similarity index 100% rename from module/metric/calc/global/rate/rate_of_delayed_finished_project_which_annual_finished.php rename to module/metric/calc/system/rate/rate_of_delayed_finished_project_which_annual_finished.php diff --git a/module/metric/calc/global/rate/rate_of_delivered_story.php b/module/metric/calc/system/rate/rate_of_delivered_story.php similarity index 100% rename from module/metric/calc/global/rate/rate_of_delivered_story.php rename to module/metric/calc/system/rate/rate_of_delivered_story.php diff --git a/module/metric/calc/global/rate/rate_of_finished_story.php b/module/metric/calc/system/rate/rate_of_finished_story.php similarity index 100% rename from module/metric/calc/global/rate/rate_of_finished_story.php rename to module/metric/calc/system/rate/rate_of_finished_story.php diff --git a/module/metric/calc/global/rate/rate_of_fixed_bug.php b/module/metric/calc/system/rate/rate_of_fixed_bug.php similarity index 100% rename from module/metric/calc/global/rate/rate_of_fixed_bug.php rename to module/metric/calc/system/rate/rate_of_fixed_bug.php diff --git a/module/metric/calc/global/rate/rate_of_undelayed_closed_execution_which_annual_finished.php b/module/metric/calc/system/rate/rate_of_undelayed_closed_execution_which_annual_finished.php similarity index 100% rename from module/metric/calc/global/rate/rate_of_undelayed_closed_execution_which_annual_finished.php rename to module/metric/calc/system/rate/rate_of_undelayed_closed_execution_which_annual_finished.php diff --git a/module/metric/calc/global/rate/rate_of_undelayed_finished_project_which_annual_finished.php b/module/metric/calc/system/rate/rate_of_undelayed_finished_project_which_annual_finished.php similarity index 100% rename from module/metric/calc/global/rate/rate_of_undelayed_finished_project_which_annual_finished.php rename to module/metric/calc/system/rate/rate_of_undelayed_finished_project_which_annual_finished.php diff --git a/module/metric/calc/global/scale/consume_of_task.php b/module/metric/calc/system/scale/consume_of_task.php similarity index 100% rename from module/metric/calc/global/scale/consume_of_task.php rename to module/metric/calc/system/scale/consume_of_task.php diff --git a/module/metric/calc/global/scale/count_of_activated_bug.php b/module/metric/calc/system/scale/count_of_activated_bug.php similarity index 100% rename from module/metric/calc/global/scale/count_of_activated_bug.php rename to module/metric/calc/system/scale/count_of_activated_bug.php diff --git a/module/metric/calc/global/scale/count_of_annual_closed_execution.php b/module/metric/calc/system/scale/count_of_annual_closed_execution.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_closed_execution.php rename to module/metric/calc/system/scale/count_of_annual_closed_execution.php diff --git a/module/metric/calc/global/scale/count_of_annual_closed_feedback.php b/module/metric/calc/system/scale/count_of_annual_closed_feedback.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_closed_feedback.php rename to module/metric/calc/system/scale/count_of_annual_closed_feedback.php diff --git a/module/metric/calc/global/scale/count_of_annual_closed_product.php b/module/metric/calc/system/scale/count_of_annual_closed_product.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_closed_product.php rename to module/metric/calc/system/scale/count_of_annual_closed_product.php diff --git a/module/metric/calc/global/scale/count_of_annual_closed_productplan.php b/module/metric/calc/system/scale/count_of_annual_closed_productplan.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_closed_productplan.php rename to module/metric/calc/system/scale/count_of_annual_closed_productplan.php diff --git a/module/metric/calc/global/scale/count_of_annual_closed_project.php b/module/metric/calc/system/scale/count_of_annual_closed_project.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_closed_project.php rename to module/metric/calc/system/scale/count_of_annual_closed_project.php diff --git a/module/metric/calc/global/scale/count_of_annual_closed_top_program.php b/module/metric/calc/system/scale/count_of_annual_closed_top_program.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_closed_top_program.php rename to module/metric/calc/system/scale/count_of_annual_closed_top_program.php diff --git a/module/metric/calc/global/scale/count_of_annual_created_bug.php b/module/metric/calc/system/scale/count_of_annual_created_bug.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_created_bug.php rename to module/metric/calc/system/scale/count_of_annual_created_bug.php diff --git a/module/metric/calc/global/scale/count_of_annual_created_case.php b/module/metric/calc/system/scale/count_of_annual_created_case.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_created_case.php rename to module/metric/calc/system/scale/count_of_annual_created_case.php diff --git a/module/metric/calc/global/scale/count_of_annual_created_doc.php b/module/metric/calc/system/scale/count_of_annual_created_doc.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_created_doc.php rename to module/metric/calc/system/scale/count_of_annual_created_doc.php diff --git a/module/metric/calc/global/scale/count_of_annual_created_execution.php b/module/metric/calc/system/scale/count_of_annual_created_execution.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_created_execution.php rename to module/metric/calc/system/scale/count_of_annual_created_execution.php diff --git a/module/metric/calc/global/scale/count_of_annual_created_feedback.php b/module/metric/calc/system/scale/count_of_annual_created_feedback.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_created_feedback.php rename to module/metric/calc/system/scale/count_of_annual_created_feedback.php diff --git a/module/metric/calc/global/scale/count_of_annual_created_product.php b/module/metric/calc/system/scale/count_of_annual_created_product.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_created_product.php rename to module/metric/calc/system/scale/count_of_annual_created_product.php diff --git a/module/metric/calc/global/scale/count_of_annual_created_productplan.php b/module/metric/calc/system/scale/count_of_annual_created_productplan.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_created_productplan.php rename to module/metric/calc/system/scale/count_of_annual_created_productplan.php diff --git a/module/metric/calc/global/scale/count_of_annual_created_project.php b/module/metric/calc/system/scale/count_of_annual_created_project.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_created_project.php rename to module/metric/calc/system/scale/count_of_annual_created_project.php diff --git a/module/metric/calc/global/scale/count_of_annual_created_release.php b/module/metric/calc/system/scale/count_of_annual_created_release.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_created_release.php rename to module/metric/calc/system/scale/count_of_annual_created_release.php diff --git a/module/metric/calc/global/scale/count_of_annual_created_story.php b/module/metric/calc/system/scale/count_of_annual_created_story.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_created_story.php rename to module/metric/calc/system/scale/count_of_annual_created_story.php diff --git a/module/metric/calc/global/scale/count_of_annual_created_task.php b/module/metric/calc/system/scale/count_of_annual_created_task.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_created_task.php rename to module/metric/calc/system/scale/count_of_annual_created_task.php diff --git a/module/metric/calc/global/scale/count_of_annual_created_top_program.php b/module/metric/calc/system/scale/count_of_annual_created_top_program.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_created_top_program.php rename to module/metric/calc/system/scale/count_of_annual_created_top_program.php diff --git a/module/metric/calc/global/scale/count_of_annual_created_user.php b/module/metric/calc/system/scale/count_of_annual_created_user.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_created_user.php rename to module/metric/calc/system/scale/count_of_annual_created_user.php diff --git a/module/metric/calc/global/scale/count_of_annual_delivered_story.php b/module/metric/calc/system/scale/count_of_annual_delivered_story.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_delivered_story.php rename to module/metric/calc/system/scale/count_of_annual_delivered_story.php diff --git a/module/metric/calc/global/scale/count_of_annual_finished_productplan.php b/module/metric/calc/system/scale/count_of_annual_finished_productplan.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_finished_productplan.php rename to module/metric/calc/system/scale/count_of_annual_finished_productplan.php diff --git a/module/metric/calc/global/scale/count_of_annual_finished_project.php b/module/metric/calc/system/scale/count_of_annual_finished_project.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_finished_project.php rename to module/metric/calc/system/scale/count_of_annual_finished_project.php diff --git a/module/metric/calc/global/scale/count_of_annual_finished_story.php b/module/metric/calc/system/scale/count_of_annual_finished_story.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_finished_story.php rename to module/metric/calc/system/scale/count_of_annual_finished_story.php diff --git a/module/metric/calc/global/scale/count_of_annual_finished_task.php b/module/metric/calc/system/scale/count_of_annual_finished_task.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_finished_task.php rename to module/metric/calc/system/scale/count_of_annual_finished_task.php diff --git a/module/metric/calc/global/scale/count_of_annual_fixed_bug.php b/module/metric/calc/system/scale/count_of_annual_fixed_bug.php similarity index 100% rename from module/metric/calc/global/scale/count_of_annual_fixed_bug.php rename to module/metric/calc/system/scale/count_of_annual_fixed_bug.php diff --git a/module/metric/calc/global/scale/count_of_bug.php b/module/metric/calc/system/scale/count_of_bug.php similarity index 100% rename from module/metric/calc/global/scale/count_of_bug.php rename to module/metric/calc/system/scale/count_of_bug.php diff --git a/module/metric/calc/global/scale/count_of_case.php b/module/metric/calc/system/scale/count_of_case.php similarity index 100% rename from module/metric/calc/global/scale/count_of_case.php rename to module/metric/calc/system/scale/count_of_case.php diff --git a/module/metric/calc/global/scale/count_of_closed_bug.php b/module/metric/calc/system/scale/count_of_closed_bug.php similarity index 100% rename from module/metric/calc/global/scale/count_of_closed_bug.php rename to module/metric/calc/system/scale/count_of_closed_bug.php diff --git a/module/metric/calc/global/scale/count_of_closed_execution.php b/module/metric/calc/system/scale/count_of_closed_execution.php similarity index 100% rename from module/metric/calc/global/scale/count_of_closed_execution.php rename to module/metric/calc/system/scale/count_of_closed_execution.php diff --git a/module/metric/calc/global/scale/count_of_closed_feedback.php b/module/metric/calc/system/scale/count_of_closed_feedback.php similarity index 100% rename from module/metric/calc/global/scale/count_of_closed_feedback.php rename to module/metric/calc/system/scale/count_of_closed_feedback.php diff --git a/module/metric/calc/global/scale/count_of_closed_product.php b/module/metric/calc/system/scale/count_of_closed_product.php similarity index 100% rename from module/metric/calc/global/scale/count_of_closed_product.php rename to module/metric/calc/system/scale/count_of_closed_product.php diff --git a/module/metric/calc/global/scale/count_of_closed_program.php b/module/metric/calc/system/scale/count_of_closed_program.php similarity index 100% rename from module/metric/calc/global/scale/count_of_closed_program.php rename to module/metric/calc/system/scale/count_of_closed_program.php diff --git a/module/metric/calc/global/scale/count_of_closed_project.php b/module/metric/calc/system/scale/count_of_closed_project.php similarity index 100% rename from module/metric/calc/global/scale/count_of_closed_project.php rename to module/metric/calc/system/scale/count_of_closed_project.php diff --git a/module/metric/calc/global/scale/count_of_closed_story.php b/module/metric/calc/system/scale/count_of_closed_story.php similarity index 100% rename from module/metric/calc/global/scale/count_of_closed_story.php rename to module/metric/calc/system/scale/count_of_closed_story.php diff --git a/module/metric/calc/global/scale/count_of_closed_task.php b/module/metric/calc/system/scale/count_of_closed_task.php similarity index 100% rename from module/metric/calc/global/scale/count_of_closed_task.php rename to module/metric/calc/system/scale/count_of_closed_task.php diff --git a/module/metric/calc/global/scale/count_of_closed_top_program.php b/module/metric/calc/system/scale/count_of_closed_top_program.php similarity index 100% rename from module/metric/calc/global/scale/count_of_closed_top_program.php rename to module/metric/calc/system/scale/count_of_closed_top_program.php diff --git a/module/metric/calc/global/scale/count_of_daily_closed_bug.php b/module/metric/calc/system/scale/count_of_daily_closed_bug.php similarity index 100% rename from module/metric/calc/global/scale/count_of_daily_closed_bug.php rename to module/metric/calc/system/scale/count_of_daily_closed_bug.php diff --git a/module/metric/calc/global/scale/count_of_daily_created_story.php b/module/metric/calc/system/scale/count_of_daily_created_story.php similarity index 100% rename from module/metric/calc/global/scale/count_of_daily_created_story.php rename to module/metric/calc/system/scale/count_of_daily_created_story.php diff --git a/module/metric/calc/global/scale/count_of_daily_finished_task.php b/module/metric/calc/system/scale/count_of_daily_finished_task.php similarity index 100% rename from module/metric/calc/global/scale/count_of_daily_finished_task.php rename to module/metric/calc/system/scale/count_of_daily_finished_task.php diff --git a/module/metric/calc/global/scale/count_of_daily_run_case.php b/module/metric/calc/system/scale/count_of_daily_run_case.php similarity index 100% rename from module/metric/calc/global/scale/count_of_daily_run_case.php rename to module/metric/calc/system/scale/count_of_daily_run_case.php diff --git a/module/metric/calc/global/scale/count_of_delayed_finished_execution_which_annual_finished.php b/module/metric/calc/system/scale/count_of_delayed_finished_execution_which_annual_finished.php similarity index 100% rename from module/metric/calc/global/scale/count_of_delayed_finished_execution_which_annual_finished.php rename to module/metric/calc/system/scale/count_of_delayed_finished_execution_which_annual_finished.php diff --git a/module/metric/calc/global/scale/count_of_delayed_finished_execution_which_finished.php b/module/metric/calc/system/scale/count_of_delayed_finished_execution_which_finished.php similarity index 100% rename from module/metric/calc/global/scale/count_of_delayed_finished_execution_which_finished.php rename to module/metric/calc/system/scale/count_of_delayed_finished_execution_which_finished.php diff --git a/module/metric/calc/global/scale/count_of_delayed_finished_project_which_annual_finished.php b/module/metric/calc/system/scale/count_of_delayed_finished_project_which_annual_finished.php similarity index 100% rename from module/metric/calc/global/scale/count_of_delayed_finished_project_which_annual_finished.php rename to module/metric/calc/system/scale/count_of_delayed_finished_project_which_annual_finished.php diff --git a/module/metric/calc/global/scale/count_of_delayed_finished_project_which_finished.php b/module/metric/calc/system/scale/count_of_delayed_finished_project_which_finished.php similarity index 100% rename from module/metric/calc/global/scale/count_of_delayed_finished_project_which_finished.php rename to module/metric/calc/system/scale/count_of_delayed_finished_project_which_finished.php diff --git a/module/metric/calc/global/scale/count_of_delivered_story.php b/module/metric/calc/system/scale/count_of_delivered_story.php similarity index 100% rename from module/metric/calc/global/scale/count_of_delivered_story.php rename to module/metric/calc/system/scale/count_of_delivered_story.php diff --git a/module/metric/calc/global/scale/count_of_doc.php b/module/metric/calc/system/scale/count_of_doc.php similarity index 100% rename from module/metric/calc/global/scale/count_of_doc.php rename to module/metric/calc/system/scale/count_of_doc.php diff --git a/module/metric/calc/global/scale/count_of_doing_execution.php b/module/metric/calc/system/scale/count_of_doing_execution.php similarity index 100% rename from module/metric/calc/global/scale/count_of_doing_execution.php rename to module/metric/calc/system/scale/count_of_doing_execution.php diff --git a/module/metric/calc/global/scale/count_of_doing_program.php b/module/metric/calc/system/scale/count_of_doing_program.php similarity index 100% rename from module/metric/calc/global/scale/count_of_doing_program.php rename to module/metric/calc/system/scale/count_of_doing_program.php diff --git a/module/metric/calc/global/scale/count_of_doing_project.php b/module/metric/calc/system/scale/count_of_doing_project.php similarity index 100% rename from module/metric/calc/global/scale/count_of_doing_project.php rename to module/metric/calc/system/scale/count_of_doing_project.php diff --git a/module/metric/calc/global/scale/count_of_execution.php b/module/metric/calc/system/scale/count_of_execution.php similarity index 100% rename from module/metric/calc/global/scale/count_of_execution.php rename to module/metric/calc/system/scale/count_of_execution.php diff --git a/module/metric/calc/global/scale/count_of_feedback.php b/module/metric/calc/system/scale/count_of_feedback.php similarity index 100% rename from module/metric/calc/global/scale/count_of_feedback.php rename to module/metric/calc/system/scale/count_of_feedback.php diff --git a/module/metric/calc/global/scale/count_of_finished_productplan.php b/module/metric/calc/system/scale/count_of_finished_productplan.php similarity index 100% rename from module/metric/calc/global/scale/count_of_finished_productplan.php rename to module/metric/calc/system/scale/count_of_finished_productplan.php diff --git a/module/metric/calc/global/scale/count_of_finished_story.php b/module/metric/calc/system/scale/count_of_finished_story.php similarity index 100% rename from module/metric/calc/global/scale/count_of_finished_story.php rename to module/metric/calc/system/scale/count_of_finished_story.php diff --git a/module/metric/calc/global/scale/count_of_finished_task.php b/module/metric/calc/system/scale/count_of_finished_task.php similarity index 100% rename from module/metric/calc/global/scale/count_of_finished_task.php rename to module/metric/calc/system/scale/count_of_finished_task.php diff --git a/module/metric/calc/global/scale/count_of_fixed_bug.php b/module/metric/calc/system/scale/count_of_fixed_bug.php similarity index 100% rename from module/metric/calc/global/scale/count_of_fixed_bug.php rename to module/metric/calc/system/scale/count_of_fixed_bug.php diff --git a/module/metric/calc/global/scale/count_of_invalid_story.php b/module/metric/calc/system/scale/count_of_invalid_story.php similarity index 100% rename from module/metric/calc/global/scale/count_of_invalid_story.php rename to module/metric/calc/system/scale/count_of_invalid_story.php diff --git a/module/metric/calc/global/scale/count_of_line.php b/module/metric/calc/system/scale/count_of_line.php similarity index 100% rename from module/metric/calc/global/scale/count_of_line.php rename to module/metric/calc/system/scale/count_of_line.php diff --git a/module/metric/calc/global/scale/count_of_marker_release.php b/module/metric/calc/system/scale/count_of_marker_release.php similarity index 100% rename from module/metric/calc/global/scale/count_of_marker_release.php rename to module/metric/calc/system/scale/count_of_marker_release.php diff --git a/module/metric/calc/global/scale/count_of_monthly_closed_execution.php b/module/metric/calc/system/scale/count_of_monthly_closed_execution.php similarity index 100% rename from module/metric/calc/global/scale/count_of_monthly_closed_execution.php rename to module/metric/calc/system/scale/count_of_monthly_closed_execution.php diff --git a/module/metric/calc/global/scale/count_of_monthly_closed_project.php b/module/metric/calc/system/scale/count_of_monthly_closed_project.php similarity index 100% rename from module/metric/calc/global/scale/count_of_monthly_closed_project.php rename to module/metric/calc/system/scale/count_of_monthly_closed_project.php diff --git a/module/metric/calc/global/scale/count_of_monthly_created_bug.php b/module/metric/calc/system/scale/count_of_monthly_created_bug.php similarity index 100% rename from module/metric/calc/global/scale/count_of_monthly_created_bug.php rename to module/metric/calc/system/scale/count_of_monthly_created_bug.php diff --git a/module/metric/calc/global/scale/count_of_monthly_created_execution.php b/module/metric/calc/system/scale/count_of_monthly_created_execution.php similarity index 100% rename from module/metric/calc/global/scale/count_of_monthly_created_execution.php rename to module/metric/calc/system/scale/count_of_monthly_created_execution.php diff --git a/module/metric/calc/global/scale/count_of_monthly_created_project.php b/module/metric/calc/system/scale/count_of_monthly_created_project.php similarity index 100% rename from module/metric/calc/global/scale/count_of_monthly_created_project.php rename to module/metric/calc/system/scale/count_of_monthly_created_project.php diff --git a/module/metric/calc/global/scale/count_of_monthly_created_release.php b/module/metric/calc/system/scale/count_of_monthly_created_release.php similarity index 100% rename from module/metric/calc/global/scale/count_of_monthly_created_release.php rename to module/metric/calc/system/scale/count_of_monthly_created_release.php diff --git a/module/metric/calc/global/scale/count_of_monthly_created_story.php b/module/metric/calc/system/scale/count_of_monthly_created_story.php similarity index 100% rename from module/metric/calc/global/scale/count_of_monthly_created_story.php rename to module/metric/calc/system/scale/count_of_monthly_created_story.php diff --git a/module/metric/calc/global/scale/count_of_monthly_created_task.php b/module/metric/calc/system/scale/count_of_monthly_created_task.php similarity index 100% rename from module/metric/calc/global/scale/count_of_monthly_created_task.php rename to module/metric/calc/system/scale/count_of_monthly_created_task.php diff --git a/module/metric/calc/global/scale/count_of_monthly_finished_story.php b/module/metric/calc/system/scale/count_of_monthly_finished_story.php similarity index 100% rename from module/metric/calc/global/scale/count_of_monthly_finished_story.php rename to module/metric/calc/system/scale/count_of_monthly_finished_story.php diff --git a/module/metric/calc/global/scale/count_of_monthly_finished_task.php b/module/metric/calc/system/scale/count_of_monthly_finished_task.php similarity index 100% rename from module/metric/calc/global/scale/count_of_monthly_finished_task.php rename to module/metric/calc/system/scale/count_of_monthly_finished_task.php diff --git a/module/metric/calc/global/scale/count_of_monthly_fixed_bug.php b/module/metric/calc/system/scale/count_of_monthly_fixed_bug.php similarity index 100% rename from module/metric/calc/global/scale/count_of_monthly_fixed_bug.php rename to module/metric/calc/system/scale/count_of_monthly_fixed_bug.php diff --git a/module/metric/calc/global/scale/count_of_normal_product.php b/module/metric/calc/system/scale/count_of_normal_product.php similarity index 100% rename from module/metric/calc/global/scale/count_of_normal_product.php rename to module/metric/calc/system/scale/count_of_normal_product.php diff --git a/module/metric/calc/global/scale/count_of_product.php b/module/metric/calc/system/scale/count_of_product.php similarity index 100% rename from module/metric/calc/global/scale/count_of_product.php rename to module/metric/calc/system/scale/count_of_product.php diff --git a/module/metric/calc/global/scale/count_of_productplan.php b/module/metric/calc/system/scale/count_of_productplan.php similarity index 100% rename from module/metric/calc/global/scale/count_of_productplan.php rename to module/metric/calc/system/scale/count_of_productplan.php diff --git a/module/metric/calc/global/scale/count_of_program.php b/module/metric/calc/system/scale/count_of_program.php similarity index 100% rename from module/metric/calc/global/scale/count_of_program.php rename to module/metric/calc/system/scale/count_of_program.php diff --git a/module/metric/calc/global/scale/count_of_project.php b/module/metric/calc/system/scale/count_of_project.php similarity index 100% rename from module/metric/calc/global/scale/count_of_project.php rename to module/metric/calc/system/scale/count_of_project.php diff --git a/module/metric/calc/global/scale/count_of_release.php b/module/metric/calc/system/scale/count_of_release.php similarity index 100% rename from module/metric/calc/global/scale/count_of_release.php rename to module/metric/calc/system/scale/count_of_release.php diff --git a/module/metric/calc/global/scale/count_of_resolved_bug.php b/module/metric/calc/system/scale/count_of_resolved_bug.php similarity index 100% rename from module/metric/calc/global/scale/count_of_resolved_bug.php rename to module/metric/calc/system/scale/count_of_resolved_bug.php diff --git a/module/metric/calc/global/scale/count_of_story.php b/module/metric/calc/system/scale/count_of_story.php similarity index 100% rename from module/metric/calc/global/scale/count_of_story.php rename to module/metric/calc/system/scale/count_of_story.php diff --git a/module/metric/calc/global/scale/count_of_suspended_execution.php b/module/metric/calc/system/scale/count_of_suspended_execution.php similarity index 100% rename from module/metric/calc/global/scale/count_of_suspended_execution.php rename to module/metric/calc/system/scale/count_of_suspended_execution.php diff --git a/module/metric/calc/global/scale/count_of_suspended_program.php b/module/metric/calc/system/scale/count_of_suspended_program.php similarity index 100% rename from module/metric/calc/global/scale/count_of_suspended_program.php rename to module/metric/calc/system/scale/count_of_suspended_program.php diff --git a/module/metric/calc/global/scale/count_of_suspended_project.php b/module/metric/calc/system/scale/count_of_suspended_project.php similarity index 100% rename from module/metric/calc/global/scale/count_of_suspended_project.php rename to module/metric/calc/system/scale/count_of_suspended_project.php diff --git a/module/metric/calc/global/scale/count_of_task.php b/module/metric/calc/system/scale/count_of_task.php similarity index 100% rename from module/metric/calc/global/scale/count_of_task.php rename to module/metric/calc/system/scale/count_of_task.php diff --git a/module/metric/calc/global/scale/count_of_top_program.php b/module/metric/calc/system/scale/count_of_top_program.php similarity index 100% rename from module/metric/calc/global/scale/count_of_top_program.php rename to module/metric/calc/system/scale/count_of_top_program.php diff --git a/module/metric/calc/global/scale/count_of_unclosed_bug.php b/module/metric/calc/system/scale/count_of_unclosed_bug.php similarity index 100% rename from module/metric/calc/global/scale/count_of_unclosed_bug.php rename to module/metric/calc/system/scale/count_of_unclosed_bug.php diff --git a/module/metric/calc/global/scale/count_of_unclosed_execution.php b/module/metric/calc/system/scale/count_of_unclosed_execution.php similarity index 100% rename from module/metric/calc/global/scale/count_of_unclosed_execution.php rename to module/metric/calc/system/scale/count_of_unclosed_execution.php diff --git a/module/metric/calc/global/scale/count_of_unclosed_project.php b/module/metric/calc/system/scale/count_of_unclosed_project.php similarity index 100% rename from module/metric/calc/global/scale/count_of_unclosed_project.php rename to module/metric/calc/system/scale/count_of_unclosed_project.php diff --git a/module/metric/calc/global/scale/count_of_unclosed_story.php b/module/metric/calc/system/scale/count_of_unclosed_story.php similarity index 100% rename from module/metric/calc/global/scale/count_of_unclosed_story.php rename to module/metric/calc/system/scale/count_of_unclosed_story.php diff --git a/module/metric/calc/global/scale/count_of_unclosed_top_program.php b/module/metric/calc/system/scale/count_of_unclosed_top_program.php similarity index 100% rename from module/metric/calc/global/scale/count_of_unclosed_top_program.php rename to module/metric/calc/system/scale/count_of_unclosed_top_program.php diff --git a/module/metric/calc/global/scale/count_of_undelayed_finished_execution_which_annual_finished.php b/module/metric/calc/system/scale/count_of_undelayed_finished_execution_which_annual_finished.php similarity index 100% rename from module/metric/calc/global/scale/count_of_undelayed_finished_execution_which_annual_finished.php rename to module/metric/calc/system/scale/count_of_undelayed_finished_execution_which_annual_finished.php diff --git a/module/metric/calc/global/scale/count_of_undelayed_finished_execution_which_finished.php b/module/metric/calc/system/scale/count_of_undelayed_finished_execution_which_finished.php similarity index 100% rename from module/metric/calc/global/scale/count_of_undelayed_finished_execution_which_finished.php rename to module/metric/calc/system/scale/count_of_undelayed_finished_execution_which_finished.php diff --git a/module/metric/calc/global/scale/count_of_undelayed_finished_project_which_annual_finished.php b/module/metric/calc/system/scale/count_of_undelayed_finished_project_which_annual_finished.php similarity index 100% rename from module/metric/calc/global/scale/count_of_undelayed_finished_project_which_annual_finished.php rename to module/metric/calc/system/scale/count_of_undelayed_finished_project_which_annual_finished.php diff --git a/module/metric/calc/global/scale/count_of_undelayed_finished_project_which_annual_started.php b/module/metric/calc/system/scale/count_of_undelayed_finished_project_which_annual_started.php similarity index 100% rename from module/metric/calc/global/scale/count_of_undelayed_finished_project_which_annual_started.php rename to module/metric/calc/system/scale/count_of_undelayed_finished_project_which_annual_started.php diff --git a/module/metric/calc/global/scale/count_of_undelayed_finished_project_which_finished.php b/module/metric/calc/system/scale/count_of_undelayed_finished_project_which_finished.php similarity index 100% rename from module/metric/calc/global/scale/count_of_undelayed_finished_project_which_finished.php rename to module/metric/calc/system/scale/count_of_undelayed_finished_project_which_finished.php diff --git a/module/metric/calc/global/scale/count_of_unfinished_productplan.php b/module/metric/calc/system/scale/count_of_unfinished_productplan.php similarity index 100% rename from module/metric/calc/global/scale/count_of_unfinished_productplan.php rename to module/metric/calc/system/scale/count_of_unfinished_productplan.php diff --git a/module/metric/calc/global/scale/count_of_unfinished_task.php b/module/metric/calc/system/scale/count_of_unfinished_task.php similarity index 100% rename from module/metric/calc/global/scale/count_of_unfinished_task.php rename to module/metric/calc/system/scale/count_of_unfinished_task.php diff --git a/module/metric/calc/global/scale/count_of_user.php b/module/metric/calc/system/scale/count_of_user.php similarity index 100% rename from module/metric/calc/global/scale/count_of_user.php rename to module/metric/calc/system/scale/count_of_user.php diff --git a/module/metric/calc/global/scale/count_of_valid_bug.php b/module/metric/calc/system/scale/count_of_valid_bug.php similarity index 100% rename from module/metric/calc/global/scale/count_of_valid_bug.php rename to module/metric/calc/system/scale/count_of_valid_bug.php diff --git a/module/metric/calc/global/scale/count_of_valid_story.php b/module/metric/calc/system/scale/count_of_valid_story.php similarity index 100% rename from module/metric/calc/global/scale/count_of_valid_story.php rename to module/metric/calc/system/scale/count_of_valid_story.php diff --git a/module/metric/calc/global/scale/count_of_wait_execution.php b/module/metric/calc/system/scale/count_of_wait_execution.php similarity index 100% rename from module/metric/calc/global/scale/count_of_wait_execution.php rename to module/metric/calc/system/scale/count_of_wait_execution.php diff --git a/module/metric/calc/global/scale/count_of_wait_program.php b/module/metric/calc/system/scale/count_of_wait_program.php similarity index 100% rename from module/metric/calc/global/scale/count_of_wait_program.php rename to module/metric/calc/system/scale/count_of_wait_program.php diff --git a/module/metric/calc/global/scale/count_of_wait_project.php b/module/metric/calc/system/scale/count_of_wait_project.php similarity index 100% rename from module/metric/calc/global/scale/count_of_wait_project.php rename to module/metric/calc/system/scale/count_of_wait_project.php diff --git a/module/metric/calc/global/scale/count_of_weekly_created_release.php b/module/metric/calc/system/scale/count_of_weekly_created_release.php similarity index 100% rename from module/metric/calc/global/scale/count_of_weekly_created_release.php rename to module/metric/calc/system/scale/count_of_weekly_created_release.php diff --git a/module/metric/calc/global/scale/count_of_weekly_finished_story.php b/module/metric/calc/system/scale/count_of_weekly_finished_story.php similarity index 100% rename from module/metric/calc/global/scale/count_of_weekly_finished_story.php rename to module/metric/calc/system/scale/count_of_weekly_finished_story.php diff --git a/module/metric/calc/global/scale/estimate_of_task.php b/module/metric/calc/system/scale/estimate_of_task.php similarity index 100% rename from module/metric/calc/global/scale/estimate_of_task.php rename to module/metric/calc/system/scale/estimate_of_task.php diff --git a/module/metric/calc/global/scale/left_of_task.php b/module/metric/calc/system/scale/left_of_task.php similarity index 100% rename from module/metric/calc/global/scale/left_of_task.php rename to module/metric/calc/system/scale/left_of_task.php diff --git a/module/metric/calc/global/scale/scale_of_annual_closed_story.php b/module/metric/calc/system/scale/scale_of_annual_closed_story.php similarity index 100% rename from module/metric/calc/global/scale/scale_of_annual_closed_story.php rename to module/metric/calc/system/scale/scale_of_annual_closed_story.php diff --git a/module/metric/calc/global/scale/scale_of_annual_delivered_story.php b/module/metric/calc/system/scale/scale_of_annual_delivered_story.php similarity index 100% rename from module/metric/calc/global/scale/scale_of_annual_delivered_story.php rename to module/metric/calc/system/scale/scale_of_annual_delivered_story.php diff --git a/module/metric/calc/global/scale/scale_of_annual_finished_story.php b/module/metric/calc/system/scale/scale_of_annual_finished_story.php similarity index 100% rename from module/metric/calc/global/scale/scale_of_annual_finished_story.php rename to module/metric/calc/system/scale/scale_of_annual_finished_story.php diff --git a/module/metric/calc/global/scale/scale_of_finished_story.php b/module/metric/calc/system/scale/scale_of_finished_story.php similarity index 100% rename from module/metric/calc/global/scale/scale_of_finished_story.php rename to module/metric/calc/system/scale/scale_of_finished_story.php diff --git a/module/metric/calc/global/scale/scale_of_invalid_story.php b/module/metric/calc/system/scale/scale_of_invalid_story.php similarity index 100% rename from module/metric/calc/global/scale/scale_of_invalid_story.php rename to module/metric/calc/system/scale/scale_of_invalid_story.php diff --git a/module/metric/calc/global/scale/scale_of_monthly_closed_story.php b/module/metric/calc/system/scale/scale_of_monthly_closed_story.php similarity index 100% rename from module/metric/calc/global/scale/scale_of_monthly_closed_story.php rename to module/metric/calc/system/scale/scale_of_monthly_closed_story.php diff --git a/module/metric/calc/global/scale/scale_of_monthly_delivered_story.php b/module/metric/calc/system/scale/scale_of_monthly_delivered_story.php similarity index 100% rename from module/metric/calc/global/scale/scale_of_monthly_delivered_story.php rename to module/metric/calc/system/scale/scale_of_monthly_delivered_story.php diff --git a/module/metric/calc/global/scale/scale_of_monthly_finished_story.php b/module/metric/calc/system/scale/scale_of_monthly_finished_story.php similarity index 100% rename from module/metric/calc/global/scale/scale_of_monthly_finished_story.php rename to module/metric/calc/system/scale/scale_of_monthly_finished_story.php diff --git a/module/metric/calc/global/scale/scale_of_story.php b/module/metric/calc/system/scale/scale_of_story.php similarity index 100% rename from module/metric/calc/global/scale/scale_of_story.php rename to module/metric/calc/system/scale/scale_of_story.php diff --git a/module/metric/calc/global/scale/scale_of_valid_story.php b/module/metric/calc/system/scale/scale_of_valid_story.php similarity index 100% rename from module/metric/calc/global/scale/scale_of_valid_story.php rename to module/metric/calc/system/scale/scale_of_valid_story.php diff --git a/module/metric/calc/global/scale/scale_of_weekly_finished_story.php b/module/metric/calc/system/scale/scale_of_weekly_finished_story.php similarity index 100% rename from module/metric/calc/global/scale/scale_of_weekly_finished_story.php rename to module/metric/calc/system/scale/scale_of_weekly_finished_story.php diff --git a/module/metric/test/calc/global/hour/consume_of_annual_closed_project.php b/module/metric/test/calc/system/hour/consume_of_annual_closed_project.php similarity index 100% rename from module/metric/test/calc/global/hour/consume_of_annual_closed_project.php rename to module/metric/test/calc/system/hour/consume_of_annual_closed_project.php diff --git a/module/metric/test/calc/global/hour/consume_of_monthly_closed_project.php b/module/metric/test/calc/system/hour/consume_of_monthly_closed_project.php similarity index 100% rename from module/metric/test/calc/global/hour/consume_of_monthly_closed_project.php rename to module/metric/test/calc/system/hour/consume_of_monthly_closed_project.php diff --git a/module/metric/test/calc/global/hour/day_of_annual_effort.php b/module/metric/test/calc/system/hour/day_of_annual_effort.php similarity index 100% rename from module/metric/test/calc/global/hour/day_of_annual_effort.php rename to module/metric/test/calc/system/hour/day_of_annual_effort.php diff --git a/module/metric/test/calc/global/hour/day_of_daily_effort.php b/module/metric/test/calc/system/hour/day_of_daily_effort.php similarity index 100% rename from module/metric/test/calc/global/hour/day_of_daily_effort.php rename to module/metric/test/calc/system/hour/day_of_daily_effort.php diff --git a/module/metric/test/calc/global/hour/estimate_of_annual_closed_project.php b/module/metric/test/calc/system/hour/estimate_of_annual_closed_project.php similarity index 100% rename from module/metric/test/calc/global/hour/estimate_of_annual_closed_project.php rename to module/metric/test/calc/system/hour/estimate_of_annual_closed_project.php diff --git a/module/metric/test/calc/global/hour/hour_of_annual_effort.php b/module/metric/test/calc/system/hour/hour_of_annual_effort.php similarity index 100% rename from module/metric/test/calc/global/hour/hour_of_annual_effort.php rename to module/metric/test/calc/system/hour/hour_of_annual_effort.php diff --git a/module/metric/test/calc/global/hour/hour_of_daily_effort.php b/module/metric/test/calc/system/hour/hour_of_daily_effort.php similarity index 100% rename from module/metric/test/calc/global/hour/hour_of_daily_effort.php rename to module/metric/test/calc/system/hour/hour_of_daily_effort.php diff --git a/module/metric/test/calc/global/rate/rate_of_annual_delivered_story.php b/module/metric/test/calc/system/rate/rate_of_annual_delivered_story.php similarity index 100% rename from module/metric/test/calc/global/rate/rate_of_annual_delivered_story.php rename to module/metric/test/calc/system/rate/rate_of_annual_delivered_story.php diff --git a/module/metric/test/calc/global/rate/rate_of_annual_finished_story.php b/module/metric/test/calc/system/rate/rate_of_annual_finished_story.php similarity index 100% rename from module/metric/test/calc/global/rate/rate_of_annual_finished_story.php rename to module/metric/test/calc/system/rate/rate_of_annual_finished_story.php diff --git a/module/metric/test/calc/global/rate/rate_of_delayed_closed_execution_which_annual_finished.php b/module/metric/test/calc/system/rate/rate_of_delayed_closed_execution_which_annual_finished.php similarity index 100% rename from module/metric/test/calc/global/rate/rate_of_delayed_closed_execution_which_annual_finished.php rename to module/metric/test/calc/system/rate/rate_of_delayed_closed_execution_which_annual_finished.php diff --git a/module/metric/test/calc/global/rate/rate_of_delayed_finished_project_which_annual_finished.php b/module/metric/test/calc/system/rate/rate_of_delayed_finished_project_which_annual_finished.php similarity index 100% rename from module/metric/test/calc/global/rate/rate_of_delayed_finished_project_which_annual_finished.php rename to module/metric/test/calc/system/rate/rate_of_delayed_finished_project_which_annual_finished.php diff --git a/module/metric/test/calc/global/rate/rate_of_delivered_story.php b/module/metric/test/calc/system/rate/rate_of_delivered_story.php similarity index 100% rename from module/metric/test/calc/global/rate/rate_of_delivered_story.php rename to module/metric/test/calc/system/rate/rate_of_delivered_story.php diff --git a/module/metric/test/calc/global/rate/rate_of_finished_story.php b/module/metric/test/calc/system/rate/rate_of_finished_story.php similarity index 100% rename from module/metric/test/calc/global/rate/rate_of_finished_story.php rename to module/metric/test/calc/system/rate/rate_of_finished_story.php diff --git a/module/metric/test/calc/global/rate/rate_of_fixed_bug.php b/module/metric/test/calc/system/rate/rate_of_fixed_bug.php similarity index 100% rename from module/metric/test/calc/global/rate/rate_of_fixed_bug.php rename to module/metric/test/calc/system/rate/rate_of_fixed_bug.php diff --git a/module/metric/test/calc/global/scale/consume_of_task.php b/module/metric/test/calc/system/scale/consume_of_task.php similarity index 100% rename from module/metric/test/calc/global/scale/consume_of_task.php rename to module/metric/test/calc/system/scale/consume_of_task.php diff --git a/module/metric/test/calc/global/scale/count_of_activated_bug.php b/module/metric/test/calc/system/scale/count_of_activated_bug.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_activated_bug.php rename to module/metric/test/calc/system/scale/count_of_activated_bug.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_closed_execution.php b/module/metric/test/calc/system/scale/count_of_annual_closed_execution.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_closed_execution.php rename to module/metric/test/calc/system/scale/count_of_annual_closed_execution.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_closed_feedback.php b/module/metric/test/calc/system/scale/count_of_annual_closed_feedback.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_closed_feedback.php rename to module/metric/test/calc/system/scale/count_of_annual_closed_feedback.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_closed_product.php b/module/metric/test/calc/system/scale/count_of_annual_closed_product.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_closed_product.php rename to module/metric/test/calc/system/scale/count_of_annual_closed_product.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_closed_productplan.php b/module/metric/test/calc/system/scale/count_of_annual_closed_productplan.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_closed_productplan.php rename to module/metric/test/calc/system/scale/count_of_annual_closed_productplan.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_closed_project.php b/module/metric/test/calc/system/scale/count_of_annual_closed_project.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_closed_project.php rename to module/metric/test/calc/system/scale/count_of_annual_closed_project.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_closed_top_program.php b/module/metric/test/calc/system/scale/count_of_annual_closed_top_program.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_closed_top_program.php rename to module/metric/test/calc/system/scale/count_of_annual_closed_top_program.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_created_bug.php b/module/metric/test/calc/system/scale/count_of_annual_created_bug.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_created_bug.php rename to module/metric/test/calc/system/scale/count_of_annual_created_bug.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_created_case.php b/module/metric/test/calc/system/scale/count_of_annual_created_case.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_created_case.php rename to module/metric/test/calc/system/scale/count_of_annual_created_case.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_created_doc.php b/module/metric/test/calc/system/scale/count_of_annual_created_doc.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_created_doc.php rename to module/metric/test/calc/system/scale/count_of_annual_created_doc.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_created_execution.php b/module/metric/test/calc/system/scale/count_of_annual_created_execution.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_created_execution.php rename to module/metric/test/calc/system/scale/count_of_annual_created_execution.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_created_feedback.php b/module/metric/test/calc/system/scale/count_of_annual_created_feedback.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_created_feedback.php rename to module/metric/test/calc/system/scale/count_of_annual_created_feedback.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_created_product.php b/module/metric/test/calc/system/scale/count_of_annual_created_product.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_created_product.php rename to module/metric/test/calc/system/scale/count_of_annual_created_product.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_created_productplan.php b/module/metric/test/calc/system/scale/count_of_annual_created_productplan.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_created_productplan.php rename to module/metric/test/calc/system/scale/count_of_annual_created_productplan.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_created_project.php b/module/metric/test/calc/system/scale/count_of_annual_created_project.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_created_project.php rename to module/metric/test/calc/system/scale/count_of_annual_created_project.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_created_release.php b/module/metric/test/calc/system/scale/count_of_annual_created_release.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_created_release.php rename to module/metric/test/calc/system/scale/count_of_annual_created_release.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_created_story.php b/module/metric/test/calc/system/scale/count_of_annual_created_story.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_created_story.php rename to module/metric/test/calc/system/scale/count_of_annual_created_story.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_created_task.php b/module/metric/test/calc/system/scale/count_of_annual_created_task.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_created_task.php rename to module/metric/test/calc/system/scale/count_of_annual_created_task.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_created_top_program.php b/module/metric/test/calc/system/scale/count_of_annual_created_top_program.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_created_top_program.php rename to module/metric/test/calc/system/scale/count_of_annual_created_top_program.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_created_user.php b/module/metric/test/calc/system/scale/count_of_annual_created_user.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_created_user.php rename to module/metric/test/calc/system/scale/count_of_annual_created_user.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_delivered_story.php b/module/metric/test/calc/system/scale/count_of_annual_delivered_story.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_delivered_story.php rename to module/metric/test/calc/system/scale/count_of_annual_delivered_story.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_finished_productplan.php b/module/metric/test/calc/system/scale/count_of_annual_finished_productplan.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_finished_productplan.php rename to module/metric/test/calc/system/scale/count_of_annual_finished_productplan.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_finished_project.php b/module/metric/test/calc/system/scale/count_of_annual_finished_project.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_finished_project.php rename to module/metric/test/calc/system/scale/count_of_annual_finished_project.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_finished_story.php b/module/metric/test/calc/system/scale/count_of_annual_finished_story.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_finished_story.php rename to module/metric/test/calc/system/scale/count_of_annual_finished_story.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_finished_task.php b/module/metric/test/calc/system/scale/count_of_annual_finished_task.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_finished_task.php rename to module/metric/test/calc/system/scale/count_of_annual_finished_task.php diff --git a/module/metric/test/calc/global/scale/count_of_annual_fixed_bug.php b/module/metric/test/calc/system/scale/count_of_annual_fixed_bug.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_annual_fixed_bug.php rename to module/metric/test/calc/system/scale/count_of_annual_fixed_bug.php diff --git a/module/metric/test/calc/global/scale/count_of_bug.php b/module/metric/test/calc/system/scale/count_of_bug.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_bug.php rename to module/metric/test/calc/system/scale/count_of_bug.php diff --git a/module/metric/test/calc/global/scale/count_of_case.php b/module/metric/test/calc/system/scale/count_of_case.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_case.php rename to module/metric/test/calc/system/scale/count_of_case.php diff --git a/module/metric/test/calc/global/scale/count_of_closed_bug.php b/module/metric/test/calc/system/scale/count_of_closed_bug.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_closed_bug.php rename to module/metric/test/calc/system/scale/count_of_closed_bug.php diff --git a/module/metric/test/calc/global/scale/count_of_closed_execution.php b/module/metric/test/calc/system/scale/count_of_closed_execution.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_closed_execution.php rename to module/metric/test/calc/system/scale/count_of_closed_execution.php diff --git a/module/metric/test/calc/global/scale/count_of_closed_feedback.php b/module/metric/test/calc/system/scale/count_of_closed_feedback.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_closed_feedback.php rename to module/metric/test/calc/system/scale/count_of_closed_feedback.php diff --git a/module/metric/test/calc/global/scale/count_of_closed_product.php b/module/metric/test/calc/system/scale/count_of_closed_product.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_closed_product.php rename to module/metric/test/calc/system/scale/count_of_closed_product.php diff --git a/module/metric/test/calc/global/scale/count_of_closed_program.php b/module/metric/test/calc/system/scale/count_of_closed_program.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_closed_program.php rename to module/metric/test/calc/system/scale/count_of_closed_program.php diff --git a/module/metric/test/calc/global/scale/count_of_closed_project.php b/module/metric/test/calc/system/scale/count_of_closed_project.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_closed_project.php rename to module/metric/test/calc/system/scale/count_of_closed_project.php diff --git a/module/metric/test/calc/global/scale/count_of_closed_story.php b/module/metric/test/calc/system/scale/count_of_closed_story.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_closed_story.php rename to module/metric/test/calc/system/scale/count_of_closed_story.php diff --git a/module/metric/test/calc/global/scale/count_of_closed_task.php b/module/metric/test/calc/system/scale/count_of_closed_task.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_closed_task.php rename to module/metric/test/calc/system/scale/count_of_closed_task.php diff --git a/module/metric/test/calc/global/scale/count_of_closed_top_program.php b/module/metric/test/calc/system/scale/count_of_closed_top_program.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_closed_top_program.php rename to module/metric/test/calc/system/scale/count_of_closed_top_program.php diff --git a/module/metric/test/calc/global/scale/count_of_daily_closed_bug.php b/module/metric/test/calc/system/scale/count_of_daily_closed_bug.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_daily_closed_bug.php rename to module/metric/test/calc/system/scale/count_of_daily_closed_bug.php diff --git a/module/metric/test/calc/global/scale/count_of_daily_created_story.php b/module/metric/test/calc/system/scale/count_of_daily_created_story.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_daily_created_story.php rename to module/metric/test/calc/system/scale/count_of_daily_created_story.php diff --git a/module/metric/test/calc/global/scale/count_of_daily_finished_task.php b/module/metric/test/calc/system/scale/count_of_daily_finished_task.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_daily_finished_task.php rename to module/metric/test/calc/system/scale/count_of_daily_finished_task.php diff --git a/module/metric/test/calc/global/scale/count_of_daily_run_case.php b/module/metric/test/calc/system/scale/count_of_daily_run_case.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_daily_run_case.php rename to module/metric/test/calc/system/scale/count_of_daily_run_case.php diff --git a/module/metric/test/calc/global/scale/count_of_delayed_finished_execution_which_annual_finished.php b/module/metric/test/calc/system/scale/count_of_delayed_finished_execution_which_annual_finished.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_delayed_finished_execution_which_annual_finished.php rename to module/metric/test/calc/system/scale/count_of_delayed_finished_execution_which_annual_finished.php diff --git a/module/metric/test/calc/global/scale/count_of_delayed_finished_execution_which_finished.php b/module/metric/test/calc/system/scale/count_of_delayed_finished_execution_which_finished.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_delayed_finished_execution_which_finished.php rename to module/metric/test/calc/system/scale/count_of_delayed_finished_execution_which_finished.php diff --git a/module/metric/test/calc/global/scale/count_of_delayed_finished_project_which_annual_finished.php b/module/metric/test/calc/system/scale/count_of_delayed_finished_project_which_annual_finished.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_delayed_finished_project_which_annual_finished.php rename to module/metric/test/calc/system/scale/count_of_delayed_finished_project_which_annual_finished.php diff --git a/module/metric/test/calc/global/scale/count_of_delayed_finished_project_which_finished.php b/module/metric/test/calc/system/scale/count_of_delayed_finished_project_which_finished.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_delayed_finished_project_which_finished.php rename to module/metric/test/calc/system/scale/count_of_delayed_finished_project_which_finished.php diff --git a/module/metric/test/calc/global/scale/count_of_delivered_story.php b/module/metric/test/calc/system/scale/count_of_delivered_story.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_delivered_story.php rename to module/metric/test/calc/system/scale/count_of_delivered_story.php diff --git a/module/metric/test/calc/global/scale/count_of_doc.php b/module/metric/test/calc/system/scale/count_of_doc.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_doc.php rename to module/metric/test/calc/system/scale/count_of_doc.php diff --git a/module/metric/test/calc/global/scale/count_of_doing_execution.php b/module/metric/test/calc/system/scale/count_of_doing_execution.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_doing_execution.php rename to module/metric/test/calc/system/scale/count_of_doing_execution.php diff --git a/module/metric/test/calc/global/scale/count_of_doing_program.php b/module/metric/test/calc/system/scale/count_of_doing_program.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_doing_program.php rename to module/metric/test/calc/system/scale/count_of_doing_program.php diff --git a/module/metric/test/calc/global/scale/count_of_doing_project.php b/module/metric/test/calc/system/scale/count_of_doing_project.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_doing_project.php rename to module/metric/test/calc/system/scale/count_of_doing_project.php diff --git a/module/metric/test/calc/global/scale/count_of_execution.php b/module/metric/test/calc/system/scale/count_of_execution.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_execution.php rename to module/metric/test/calc/system/scale/count_of_execution.php diff --git a/module/metric/test/calc/global/scale/count_of_feedback.php b/module/metric/test/calc/system/scale/count_of_feedback.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_feedback.php rename to module/metric/test/calc/system/scale/count_of_feedback.php diff --git a/module/metric/test/calc/global/scale/count_of_finished_productplan.php b/module/metric/test/calc/system/scale/count_of_finished_productplan.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_finished_productplan.php rename to module/metric/test/calc/system/scale/count_of_finished_productplan.php diff --git a/module/metric/test/calc/global/scale/count_of_finished_story.php b/module/metric/test/calc/system/scale/count_of_finished_story.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_finished_story.php rename to module/metric/test/calc/system/scale/count_of_finished_story.php diff --git a/module/metric/test/calc/global/scale/count_of_finished_task.php b/module/metric/test/calc/system/scale/count_of_finished_task.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_finished_task.php rename to module/metric/test/calc/system/scale/count_of_finished_task.php diff --git a/module/metric/test/calc/global/scale/count_of_fixed_bug.php b/module/metric/test/calc/system/scale/count_of_fixed_bug.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_fixed_bug.php rename to module/metric/test/calc/system/scale/count_of_fixed_bug.php diff --git a/module/metric/test/calc/global/scale/count_of_invalid_story.php b/module/metric/test/calc/system/scale/count_of_invalid_story.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_invalid_story.php rename to module/metric/test/calc/system/scale/count_of_invalid_story.php diff --git a/module/metric/test/calc/global/scale/count_of_line.php b/module/metric/test/calc/system/scale/count_of_line.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_line.php rename to module/metric/test/calc/system/scale/count_of_line.php diff --git a/module/metric/test/calc/global/scale/count_of_marker_release.php b/module/metric/test/calc/system/scale/count_of_marker_release.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_marker_release.php rename to module/metric/test/calc/system/scale/count_of_marker_release.php diff --git a/module/metric/test/calc/global/scale/count_of_monthly_closed_execution.php b/module/metric/test/calc/system/scale/count_of_monthly_closed_execution.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_monthly_closed_execution.php rename to module/metric/test/calc/system/scale/count_of_monthly_closed_execution.php diff --git a/module/metric/test/calc/global/scale/count_of_monthly_closed_project.php b/module/metric/test/calc/system/scale/count_of_monthly_closed_project.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_monthly_closed_project.php rename to module/metric/test/calc/system/scale/count_of_monthly_closed_project.php diff --git a/module/metric/test/calc/global/scale/count_of_monthly_created_bug.php b/module/metric/test/calc/system/scale/count_of_monthly_created_bug.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_monthly_created_bug.php rename to module/metric/test/calc/system/scale/count_of_monthly_created_bug.php diff --git a/module/metric/test/calc/global/scale/count_of_monthly_created_execution.php b/module/metric/test/calc/system/scale/count_of_monthly_created_execution.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_monthly_created_execution.php rename to module/metric/test/calc/system/scale/count_of_monthly_created_execution.php diff --git a/module/metric/test/calc/global/scale/count_of_monthly_created_project.php b/module/metric/test/calc/system/scale/count_of_monthly_created_project.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_monthly_created_project.php rename to module/metric/test/calc/system/scale/count_of_monthly_created_project.php diff --git a/module/metric/test/calc/global/scale/count_of_monthly_created_release.php b/module/metric/test/calc/system/scale/count_of_monthly_created_release.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_monthly_created_release.php rename to module/metric/test/calc/system/scale/count_of_monthly_created_release.php diff --git a/module/metric/test/calc/global/scale/count_of_monthly_created_story.php b/module/metric/test/calc/system/scale/count_of_monthly_created_story.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_monthly_created_story.php rename to module/metric/test/calc/system/scale/count_of_monthly_created_story.php diff --git a/module/metric/test/calc/global/scale/count_of_monthly_created_task.php b/module/metric/test/calc/system/scale/count_of_monthly_created_task.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_monthly_created_task.php rename to module/metric/test/calc/system/scale/count_of_monthly_created_task.php diff --git a/module/metric/test/calc/global/scale/count_of_monthly_finished_story.php b/module/metric/test/calc/system/scale/count_of_monthly_finished_story.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_monthly_finished_story.php rename to module/metric/test/calc/system/scale/count_of_monthly_finished_story.php diff --git a/module/metric/test/calc/global/scale/count_of_monthly_finished_task.php b/module/metric/test/calc/system/scale/count_of_monthly_finished_task.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_monthly_finished_task.php rename to module/metric/test/calc/system/scale/count_of_monthly_finished_task.php diff --git a/module/metric/test/calc/global/scale/count_of_monthly_fixed_bug.php b/module/metric/test/calc/system/scale/count_of_monthly_fixed_bug.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_monthly_fixed_bug.php rename to module/metric/test/calc/system/scale/count_of_monthly_fixed_bug.php diff --git a/module/metric/test/calc/global/scale/count_of_normal_product.php b/module/metric/test/calc/system/scale/count_of_normal_product.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_normal_product.php rename to module/metric/test/calc/system/scale/count_of_normal_product.php diff --git a/module/metric/test/calc/global/scale/count_of_product.php b/module/metric/test/calc/system/scale/count_of_product.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_product.php rename to module/metric/test/calc/system/scale/count_of_product.php diff --git a/module/metric/test/calc/global/scale/count_of_productplan.php b/module/metric/test/calc/system/scale/count_of_productplan.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_productplan.php rename to module/metric/test/calc/system/scale/count_of_productplan.php diff --git a/module/metric/test/calc/global/scale/count_of_program.php b/module/metric/test/calc/system/scale/count_of_program.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_program.php rename to module/metric/test/calc/system/scale/count_of_program.php diff --git a/module/metric/test/calc/global/scale/count_of_project.php b/module/metric/test/calc/system/scale/count_of_project.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_project.php rename to module/metric/test/calc/system/scale/count_of_project.php diff --git a/module/metric/test/calc/global/scale/count_of_release.php b/module/metric/test/calc/system/scale/count_of_release.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_release.php rename to module/metric/test/calc/system/scale/count_of_release.php diff --git a/module/metric/test/calc/global/scale/count_of_resolved_bug.php b/module/metric/test/calc/system/scale/count_of_resolved_bug.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_resolved_bug.php rename to module/metric/test/calc/system/scale/count_of_resolved_bug.php diff --git a/module/metric/test/calc/global/scale/count_of_story.php b/module/metric/test/calc/system/scale/count_of_story.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_story.php rename to module/metric/test/calc/system/scale/count_of_story.php diff --git a/module/metric/test/calc/global/scale/count_of_suspended_execution.php b/module/metric/test/calc/system/scale/count_of_suspended_execution.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_suspended_execution.php rename to module/metric/test/calc/system/scale/count_of_suspended_execution.php diff --git a/module/metric/test/calc/global/scale/count_of_suspended_program.php b/module/metric/test/calc/system/scale/count_of_suspended_program.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_suspended_program.php rename to module/metric/test/calc/system/scale/count_of_suspended_program.php diff --git a/module/metric/test/calc/global/scale/count_of_suspended_project.php b/module/metric/test/calc/system/scale/count_of_suspended_project.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_suspended_project.php rename to module/metric/test/calc/system/scale/count_of_suspended_project.php diff --git a/module/metric/test/calc/global/scale/count_of_task.php b/module/metric/test/calc/system/scale/count_of_task.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_task.php rename to module/metric/test/calc/system/scale/count_of_task.php diff --git a/module/metric/test/calc/global/scale/count_of_top_program.php b/module/metric/test/calc/system/scale/count_of_top_program.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_top_program.php rename to module/metric/test/calc/system/scale/count_of_top_program.php diff --git a/module/metric/test/calc/global/scale/count_of_unclosed_bug.php b/module/metric/test/calc/system/scale/count_of_unclosed_bug.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_unclosed_bug.php rename to module/metric/test/calc/system/scale/count_of_unclosed_bug.php diff --git a/module/metric/test/calc/global/scale/count_of_unclosed_execution.php b/module/metric/test/calc/system/scale/count_of_unclosed_execution.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_unclosed_execution.php rename to module/metric/test/calc/system/scale/count_of_unclosed_execution.php diff --git a/module/metric/test/calc/global/scale/count_of_unclosed_project.php b/module/metric/test/calc/system/scale/count_of_unclosed_project.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_unclosed_project.php rename to module/metric/test/calc/system/scale/count_of_unclosed_project.php diff --git a/module/metric/test/calc/global/scale/count_of_unclosed_story.php b/module/metric/test/calc/system/scale/count_of_unclosed_story.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_unclosed_story.php rename to module/metric/test/calc/system/scale/count_of_unclosed_story.php diff --git a/module/metric/test/calc/global/scale/count_of_unclosed_top_program.php b/module/metric/test/calc/system/scale/count_of_unclosed_top_program.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_unclosed_top_program.php rename to module/metric/test/calc/system/scale/count_of_unclosed_top_program.php diff --git a/module/metric/test/calc/global/scale/count_of_undelayed_finished_execution_which_annual_finished.php b/module/metric/test/calc/system/scale/count_of_undelayed_finished_execution_which_annual_finished.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_undelayed_finished_execution_which_annual_finished.php rename to module/metric/test/calc/system/scale/count_of_undelayed_finished_execution_which_annual_finished.php diff --git a/module/metric/test/calc/global/scale/count_of_undelayed_finished_execution_which_finished.php b/module/metric/test/calc/system/scale/count_of_undelayed_finished_execution_which_finished.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_undelayed_finished_execution_which_finished.php rename to module/metric/test/calc/system/scale/count_of_undelayed_finished_execution_which_finished.php diff --git a/module/metric/test/calc/global/scale/count_of_undelayed_finished_project_which_annual_finished.php b/module/metric/test/calc/system/scale/count_of_undelayed_finished_project_which_annual_finished.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_undelayed_finished_project_which_annual_finished.php rename to module/metric/test/calc/system/scale/count_of_undelayed_finished_project_which_annual_finished.php diff --git a/module/metric/test/calc/global/scale/count_of_undelayed_finished_project_which_annual_started.php b/module/metric/test/calc/system/scale/count_of_undelayed_finished_project_which_annual_started.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_undelayed_finished_project_which_annual_started.php rename to module/metric/test/calc/system/scale/count_of_undelayed_finished_project_which_annual_started.php diff --git a/module/metric/test/calc/global/scale/count_of_undelayed_finished_project_which_finished.php b/module/metric/test/calc/system/scale/count_of_undelayed_finished_project_which_finished.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_undelayed_finished_project_which_finished.php rename to module/metric/test/calc/system/scale/count_of_undelayed_finished_project_which_finished.php diff --git a/module/metric/test/calc/global/scale/count_of_unfinished_productplan.php b/module/metric/test/calc/system/scale/count_of_unfinished_productplan.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_unfinished_productplan.php rename to module/metric/test/calc/system/scale/count_of_unfinished_productplan.php diff --git a/module/metric/test/calc/global/scale/count_of_unfinished_task.php b/module/metric/test/calc/system/scale/count_of_unfinished_task.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_unfinished_task.php rename to module/metric/test/calc/system/scale/count_of_unfinished_task.php diff --git a/module/metric/test/calc/global/scale/count_of_user.php b/module/metric/test/calc/system/scale/count_of_user.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_user.php rename to module/metric/test/calc/system/scale/count_of_user.php diff --git a/module/metric/test/calc/global/scale/count_of_valid_bug.php b/module/metric/test/calc/system/scale/count_of_valid_bug.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_valid_bug.php rename to module/metric/test/calc/system/scale/count_of_valid_bug.php diff --git a/module/metric/test/calc/global/scale/count_of_valid_story.php b/module/metric/test/calc/system/scale/count_of_valid_story.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_valid_story.php rename to module/metric/test/calc/system/scale/count_of_valid_story.php diff --git a/module/metric/test/calc/global/scale/count_of_wait_execution.php b/module/metric/test/calc/system/scale/count_of_wait_execution.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_wait_execution.php rename to module/metric/test/calc/system/scale/count_of_wait_execution.php diff --git a/module/metric/test/calc/global/scale/count_of_wait_program.php b/module/metric/test/calc/system/scale/count_of_wait_program.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_wait_program.php rename to module/metric/test/calc/system/scale/count_of_wait_program.php diff --git a/module/metric/test/calc/global/scale/count_of_wait_project.php b/module/metric/test/calc/system/scale/count_of_wait_project.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_wait_project.php rename to module/metric/test/calc/system/scale/count_of_wait_project.php diff --git a/module/metric/test/calc/global/scale/count_of_weekly_created_release.php b/module/metric/test/calc/system/scale/count_of_weekly_created_release.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_weekly_created_release.php rename to module/metric/test/calc/system/scale/count_of_weekly_created_release.php diff --git a/module/metric/test/calc/global/scale/count_of_weekly_finished_story.php b/module/metric/test/calc/system/scale/count_of_weekly_finished_story.php similarity index 100% rename from module/metric/test/calc/global/scale/count_of_weekly_finished_story.php rename to module/metric/test/calc/system/scale/count_of_weekly_finished_story.php diff --git a/module/metric/test/calc/global/scale/estimate_of_task.php b/module/metric/test/calc/system/scale/estimate_of_task.php similarity index 100% rename from module/metric/test/calc/global/scale/estimate_of_task.php rename to module/metric/test/calc/system/scale/estimate_of_task.php diff --git a/module/metric/test/calc/global/scale/left_of_task.php b/module/metric/test/calc/system/scale/left_of_task.php similarity index 100% rename from module/metric/test/calc/global/scale/left_of_task.php rename to module/metric/test/calc/system/scale/left_of_task.php diff --git a/module/metric/test/calc/global/scale/scale_of_annual_closed_story.php b/module/metric/test/calc/system/scale/scale_of_annual_closed_story.php similarity index 100% rename from module/metric/test/calc/global/scale/scale_of_annual_closed_story.php rename to module/metric/test/calc/system/scale/scale_of_annual_closed_story.php diff --git a/module/metric/test/calc/global/scale/scale_of_annual_delivered_story.php b/module/metric/test/calc/system/scale/scale_of_annual_delivered_story.php similarity index 100% rename from module/metric/test/calc/global/scale/scale_of_annual_delivered_story.php rename to module/metric/test/calc/system/scale/scale_of_annual_delivered_story.php diff --git a/module/metric/test/calc/global/scale/scale_of_annual_finished_story.php b/module/metric/test/calc/system/scale/scale_of_annual_finished_story.php similarity index 100% rename from module/metric/test/calc/global/scale/scale_of_annual_finished_story.php rename to module/metric/test/calc/system/scale/scale_of_annual_finished_story.php diff --git a/module/metric/test/calc/global/scale/scale_of_finished_story.php b/module/metric/test/calc/system/scale/scale_of_finished_story.php similarity index 100% rename from module/metric/test/calc/global/scale/scale_of_finished_story.php rename to module/metric/test/calc/system/scale/scale_of_finished_story.php diff --git a/module/metric/test/calc/global/scale/scale_of_invalid_story.php b/module/metric/test/calc/system/scale/scale_of_invalid_story.php similarity index 100% rename from module/metric/test/calc/global/scale/scale_of_invalid_story.php rename to module/metric/test/calc/system/scale/scale_of_invalid_story.php diff --git a/module/metric/test/calc/global/scale/scale_of_monthly_closed_story.php b/module/metric/test/calc/system/scale/scale_of_monthly_closed_story.php similarity index 100% rename from module/metric/test/calc/global/scale/scale_of_monthly_closed_story.php rename to module/metric/test/calc/system/scale/scale_of_monthly_closed_story.php diff --git a/module/metric/test/calc/global/scale/scale_of_monthly_delivered_story.php b/module/metric/test/calc/system/scale/scale_of_monthly_delivered_story.php similarity index 100% rename from module/metric/test/calc/global/scale/scale_of_monthly_delivered_story.php rename to module/metric/test/calc/system/scale/scale_of_monthly_delivered_story.php diff --git a/module/metric/test/calc/global/scale/scale_of_monthly_finished_story.php b/module/metric/test/calc/system/scale/scale_of_monthly_finished_story.php similarity index 100% rename from module/metric/test/calc/global/scale/scale_of_monthly_finished_story.php rename to module/metric/test/calc/system/scale/scale_of_monthly_finished_story.php diff --git a/module/metric/test/calc/global/scale/scale_of_story.php b/module/metric/test/calc/system/scale/scale_of_story.php similarity index 100% rename from module/metric/test/calc/global/scale/scale_of_story.php rename to module/metric/test/calc/system/scale/scale_of_story.php diff --git a/module/metric/test/calc/global/scale/scale_of_valid_story.php b/module/metric/test/calc/system/scale/scale_of_valid_story.php similarity index 100% rename from module/metric/test/calc/global/scale/scale_of_valid_story.php rename to module/metric/test/calc/system/scale/scale_of_valid_story.php diff --git a/module/metric/test/calc/global/scale/scale_of_weekly_finished_story.php b/module/metric/test/calc/system/scale/scale_of_weekly_finished_story.php similarity index 100% rename from module/metric/test/calc/global/scale/scale_of_weekly_finished_story.php rename to module/metric/test/calc/system/scale/scale_of_weekly_finished_story.php