diff --git a/dashboard/Metricbeat-Apache-HTTPD-server-status.json b/metricbeat/dashboard/Metricbeat-Apache-HTTPD-server-status.json
similarity index 100%
rename from dashboard/Metricbeat-Apache-HTTPD-server-status.json
rename to metricbeat/dashboard/Metricbeat-Apache-HTTPD-server-status.json
diff --git a/dashboard/Metricbeat-cpu.json b/metricbeat/dashboard/Metricbeat-cpu.json
similarity index 100%
rename from dashboard/Metricbeat-cpu.json
rename to metricbeat/dashboard/Metricbeat-cpu.json
diff --git a/dashboard/Metricbeat-filesystem-per-Host.json b/metricbeat/dashboard/Metricbeat-filesystem-per-Host.json
similarity index 100%
rename from dashboard/Metricbeat-filesystem-per-Host.json
rename to metricbeat/dashboard/Metricbeat-filesystem-per-Host.json
diff --git a/dashboard/Metricbeat-filesystem.json b/metricbeat/dashboard/Metricbeat-filesystem.json
similarity index 100%
rename from dashboard/Metricbeat-filesystem.json
rename to metricbeat/dashboard/Metricbeat-filesystem.json
diff --git a/dashboard/Metricbeat-memory.json b/metricbeat/dashboard/Metricbeat-memory.json
similarity index 100%
rename from dashboard/Metricbeat-memory.json
rename to metricbeat/dashboard/Metricbeat-memory.json
diff --git a/dashboard/Metricbeat-network.json b/metricbeat/dashboard/Metricbeat-network.json
similarity index 100%
rename from dashboard/Metricbeat-network.json
rename to metricbeat/dashboard/Metricbeat-network.json
diff --git a/dashboard/Metricbeat-overview.json b/metricbeat/dashboard/Metricbeat-overview.json
similarity index 100%
rename from dashboard/Metricbeat-overview.json
rename to metricbeat/dashboard/Metricbeat-overview.json
diff --git a/dashboard/Metricbeat-processes.json b/metricbeat/dashboard/Metricbeat-processes.json
similarity index 100%
rename from dashboard/Metricbeat-processes.json
rename to metricbeat/dashboard/Metricbeat-processes.json
diff --git a/dashboard/Metricbeat-system-overview.json b/metricbeat/dashboard/Metricbeat-system-overview.json
similarity index 100%
rename from dashboard/Metricbeat-system-overview.json
rename to metricbeat/dashboard/Metricbeat-system-overview.json
diff --git a/index-pattern/metricbeat.json b/metricbeat/index-pattern/metricbeat.json
similarity index 100%
rename from index-pattern/metricbeat.json
rename to metricbeat/index-pattern/metricbeat.json
diff --git a/search/Apache-HTTPD.json b/metricbeat/search/Apache-HTTPD.json
similarity index 100%
rename from search/Apache-HTTPD.json
rename to metricbeat/search/Apache-HTTPD.json
diff --git a/search/Cpu-Load-stats.json b/metricbeat/search/Cpu-Load-stats.json
similarity index 100%
rename from search/Cpu-Load-stats.json
rename to metricbeat/search/Cpu-Load-stats.json
diff --git a/search/Cpu-stats.json b/metricbeat/search/Cpu-stats.json
similarity index 100%
rename from search/Cpu-stats.json
rename to metricbeat/search/Cpu-stats.json
diff --git a/search/Filesystem-stats.json b/metricbeat/search/Filesystem-stats.json
similarity index 100%
rename from search/Filesystem-stats.json
rename to metricbeat/search/Filesystem-stats.json
diff --git a/search/Fsstats.json b/metricbeat/search/Fsstats.json
similarity index 100%
rename from search/Fsstats.json
rename to metricbeat/search/Fsstats.json
diff --git a/search/Load-stats.json b/metricbeat/search/Load-stats.json
similarity index 100%
rename from search/Load-stats.json
rename to metricbeat/search/Load-stats.json
diff --git a/search/Memory-stats.json b/metricbeat/search/Memory-stats.json
similarity index 100%
rename from search/Memory-stats.json
rename to metricbeat/search/Memory-stats.json
diff --git a/search/Network-data.json b/metricbeat/search/Network-data.json
similarity index 100%
rename from search/Network-data.json
rename to metricbeat/search/Network-data.json
diff --git a/search/Process-stats.json b/metricbeat/search/Process-stats.json
similarity index 100%
rename from search/Process-stats.json
rename to metricbeat/search/Process-stats.json
diff --git a/search/System-stats.json b/metricbeat/search/System-stats.json
similarity index 100%
rename from search/System-stats.json
rename to metricbeat/search/System-stats.json
diff --git a/visualization/Apache-HTTPD-CPU.json b/metricbeat/visualization/Apache-HTTPD-CPU.json
similarity index 100%
rename from visualization/Apache-HTTPD-CPU.json
rename to metricbeat/visualization/Apache-HTTPD-CPU.json
diff --git a/visualization/Apache-HTTPD-Hostname-list.json b/metricbeat/visualization/Apache-HTTPD-Hostname-list.json
similarity index 100%
rename from visualization/Apache-HTTPD-Hostname-list.json
rename to metricbeat/visualization/Apache-HTTPD-Hostname-list.json
diff --git a/visualization/Apache-HTTPD-Load1-slash-5-slash-15.json b/metricbeat/visualization/Apache-HTTPD-Load1-slash-5-slash-15.json
similarity index 100%
rename from visualization/Apache-HTTPD-Load1-slash-5-slash-15.json
rename to metricbeat/visualization/Apache-HTTPD-Load1-slash-5-slash-15.json
diff --git a/visualization/Apache-HTTPD-Scoreboard.json b/metricbeat/visualization/Apache-HTTPD-Scoreboard.json
similarity index 100%
rename from visualization/Apache-HTTPD-Scoreboard.json
rename to metricbeat/visualization/Apache-HTTPD-Scoreboard.json
diff --git a/visualization/Apache-HTTPD-Total-accesses-and-kbytes.json b/metricbeat/visualization/Apache-HTTPD-Total-accesses-and-kbytes.json
similarity index 100%
rename from visualization/Apache-HTTPD-Total-accesses-and-kbytes.json
rename to metricbeat/visualization/Apache-HTTPD-Total-accesses-and-kbytes.json
diff --git a/visualization/Apache-HTTPD-Uptime.json b/metricbeat/visualization/Apache-HTTPD-Uptime.json
similarity index 100%
rename from visualization/Apache-HTTPD-Uptime.json
rename to metricbeat/visualization/Apache-HTTPD-Uptime.json
diff --git a/visualization/Apache-HTTPD-Workers.json b/metricbeat/visualization/Apache-HTTPD-Workers.json
similarity index 100%
rename from visualization/Apache-HTTPD-Workers.json
rename to metricbeat/visualization/Apache-HTTPD-Workers.json
diff --git a/visualization/Available-Memory.json b/metricbeat/visualization/Available-Memory.json
similarity index 100%
rename from visualization/Available-Memory.json
rename to metricbeat/visualization/Available-Memory.json
diff --git a/visualization/CPU-Usage.json b/metricbeat/visualization/CPU-Usage.json
similarity index 100%
rename from visualization/CPU-Usage.json
rename to metricbeat/visualization/CPU-Usage.json
diff --git a/visualization/CPU-usage-over-time.json b/metricbeat/visualization/CPU-usage-over-time.json
similarity index 100%
rename from visualization/CPU-usage-over-time.json
rename to metricbeat/visualization/CPU-usage-over-time.json
diff --git a/visualization/CPU-usage-per-process.json b/metricbeat/visualization/CPU-usage-per-process.json
similarity index 100%
rename from visualization/CPU-usage-per-process.json
rename to metricbeat/visualization/CPU-usage-per-process.json
diff --git a/visualization/Disk-space-distribution.json b/metricbeat/visualization/Disk-space-distribution.json
similarity index 100%
rename from visualization/Disk-space-distribution.json
rename to metricbeat/visualization/Disk-space-distribution.json
diff --git a/visualization/Disk-space-overview.json b/metricbeat/visualization/Disk-space-overview.json
similarity index 100%
rename from visualization/Disk-space-overview.json
rename to metricbeat/visualization/Disk-space-overview.json
diff --git a/visualization/Disk-space.json b/metricbeat/visualization/Disk-space.json
similarity index 100%
rename from visualization/Disk-space.json
rename to metricbeat/visualization/Disk-space.json
diff --git a/visualization/Disk-utilization-over-time.json b/metricbeat/visualization/Disk-utilization-over-time.json
similarity index 100%
rename from visualization/Disk-utilization-over-time.json
rename to metricbeat/visualization/Disk-utilization-over-time.json
diff --git a/visualization/Free-disk-space-over-days.json b/metricbeat/visualization/Free-disk-space-over-days.json
similarity index 100%
rename from visualization/Free-disk-space-over-days.json
rename to metricbeat/visualization/Free-disk-space-over-days.json
diff --git a/visualization/In-vs-Out-Network-Bytes.json b/metricbeat/visualization/In-vs-Out-Network-Bytes.json
similarity index 100%
rename from visualization/In-vs-Out-Network-Bytes.json
rename to metricbeat/visualization/In-vs-Out-Network-Bytes.json
diff --git a/visualization/Memory-usage-over-time.json b/metricbeat/visualization/Memory-usage-over-time.json
similarity index 100%
rename from visualization/Memory-usage-over-time.json
rename to metricbeat/visualization/Memory-usage-over-time.json
diff --git a/visualization/Memory-usage-per-process.json b/metricbeat/visualization/Memory-usage-per-process.json
similarity index 100%
rename from visualization/Memory-usage-per-process.json
rename to metricbeat/visualization/Memory-usage-per-process.json
diff --git a/visualization/Memory-usage.json b/metricbeat/visualization/Memory-usage.json
similarity index 100%
rename from visualization/Memory-usage.json
rename to metricbeat/visualization/Memory-usage.json
diff --git a/visualization/Network-Bytes.json b/metricbeat/visualization/Network-Bytes.json
similarity index 100%
rename from visualization/Network-Bytes.json
rename to metricbeat/visualization/Network-Bytes.json
diff --git a/visualization/Network-Packetloss.json b/metricbeat/visualization/Network-Packetloss.json
similarity index 100%
rename from visualization/Network-Packetloss.json
rename to metricbeat/visualization/Network-Packetloss.json
diff --git a/visualization/Number-of-Pids.json b/metricbeat/visualization/Number-of-Pids.json
similarity index 100%
rename from visualization/Number-of-Pids.json
rename to metricbeat/visualization/Number-of-Pids.json
diff --git a/visualization/Number-of-processes.json b/metricbeat/visualization/Number-of-processes.json
similarity index 100%
rename from visualization/Number-of-processes.json
rename to metricbeat/visualization/Number-of-processes.json
diff --git a/visualization/Packet-loss-on-interfaces.json b/metricbeat/visualization/Packet-loss-on-interfaces.json
similarity index 100%
rename from visualization/Packet-loss-on-interfaces.json
rename to metricbeat/visualization/Packet-loss-on-interfaces.json
diff --git a/visualization/Servers-overview.json b/metricbeat/visualization/Servers-overview.json
similarity index 100%
rename from visualization/Servers-overview.json
rename to metricbeat/visualization/Servers-overview.json
diff --git a/visualization/Swap-usage-over-time.json b/metricbeat/visualization/Swap-usage-over-time.json
similarity index 100%
rename from visualization/Swap-usage-over-time.json
rename to metricbeat/visualization/Swap-usage-over-time.json
diff --git a/visualization/Swap-usage.json b/metricbeat/visualization/Swap-usage.json
similarity index 100%
rename from visualization/Swap-usage.json
rename to metricbeat/visualization/Swap-usage.json
diff --git a/visualization/System-Load-over-time.json b/metricbeat/visualization/System-Load-over-time.json
similarity index 100%
rename from visualization/System-Load-over-time.json
rename to metricbeat/visualization/System-Load-over-time.json
diff --git a/visualization/System-Navigation.json b/metricbeat/visualization/System-Navigation.json
similarity index 100%
rename from visualization/System-Navigation.json
rename to metricbeat/visualization/System-Navigation.json
diff --git a/visualization/System-load.json b/metricbeat/visualization/System-load.json
similarity index 100%
rename from visualization/System-load.json
rename to metricbeat/visualization/System-load.json
diff --git a/visualization/System-overview-by-host.json b/metricbeat/visualization/System-overview-by-host.json
similarity index 100%
rename from visualization/System-overview-by-host.json
rename to metricbeat/visualization/System-overview-by-host.json
diff --git a/visualization/Top-10-interfaces.json b/metricbeat/visualization/Top-10-interfaces.json
similarity index 100%
rename from visualization/Top-10-interfaces.json
rename to metricbeat/visualization/Top-10-interfaces.json
diff --git a/visualization/Top-disks-by-memory-usage.json b/metricbeat/visualization/Top-disks-by-memory-usage.json
similarity index 100%
rename from visualization/Top-disks-by-memory-usage.json
rename to metricbeat/visualization/Top-disks-by-memory-usage.json
diff --git a/visualization/Top-hosts-by-CPU-usage.json b/metricbeat/visualization/Top-hosts-by-CPU-usage.json
similarity index 100%
rename from visualization/Top-hosts-by-CPU-usage.json
rename to metricbeat/visualization/Top-hosts-by-CPU-usage.json
diff --git a/visualization/Top-hosts-by-disk-size.json b/metricbeat/visualization/Top-hosts-by-disk-size.json
similarity index 100%
rename from visualization/Top-hosts-by-disk-size.json
rename to metricbeat/visualization/Top-hosts-by-disk-size.json
diff --git a/visualization/Top-hosts-by-memory-usage.json b/metricbeat/visualization/Top-hosts-by-memory-usage.json
similarity index 100%
rename from visualization/Top-hosts-by-memory-usage.json
rename to metricbeat/visualization/Top-hosts-by-memory-usage.json
diff --git a/visualization/Top-processes-by-CPU-usage.json b/metricbeat/visualization/Top-processes-by-CPU-usage.json
similarity index 100%
rename from visualization/Top-processes-by-CPU-usage.json
rename to metricbeat/visualization/Top-processes-by-CPU-usage.json
diff --git a/visualization/Top-processes-by-memory-usage.json b/metricbeat/visualization/Top-processes-by-memory-usage.json
similarity index 100%
rename from visualization/Top-processes-by-memory-usage.json
rename to metricbeat/visualization/Top-processes-by-memory-usage.json
diff --git a/visualization/Total-Memory.json b/metricbeat/visualization/Total-Memory.json
similarity index 100%
rename from visualization/Total-Memory.json
rename to metricbeat/visualization/Total-Memory.json
diff --git a/visualization/Total-files-over-days.json b/metricbeat/visualization/Total-files-over-days.json
similarity index 100%
rename from visualization/Total-files-over-days.json
rename to metricbeat/visualization/Total-files-over-days.json