reorganized json files

data/grid5000/environments/sid-x64-base-1.0.json

 {
-  "tcp_bandwidth": 1000000000,
-  "state": "stable",
-  "consoles": [
-    {
-      "bps": 34800,
-      "port": "ttyS0"
-    }
-  ],
-  "max_open_files": 8192,
   "accounts": [
     {
       "login": "root",
@@ -18,12 +9,6 @@
       "password": "grid5000"
     }
   ],
-  "based_on": "Debian version sid for amd64",
-  "x11_forwarding": true,
-  "services": [
-
-  ],
-  "kernel": "2.6.18-8",
   "applications": [
     "Vim",
     "XEmacs",
@@ -34,6 +19,24 @@
     "Python",
     "Ruby"
   ],
+  "based_on": "Debian version sid for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
+    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
+  },
+  "kernel": "2.6.18-8",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "sid-x64-base-1.0",
   "valid_on": [
@@ -48,8 +51,5 @@
     "Sun X2200 M2",
     "Sun X4100"
   ],
-  "file": {
-    "md5": "e39be32c087f0c9777fd0b0ad7d12050",
-    "path": "\/home\/nancy\/xdelaruelle\/images\/sid-x64-base-1.0.tgz"
-  }
+  "x11_forwarding": true
 }
\ No newline at end of file

data/grid5000/sites/bordeaux/bordeaux.json

 {
-  "longitude": null,
-  "user_support_contact": null,
-  "latitude": null,
-  "security_contact": null,
-  "web": null,
   "description": "",
-  "sys_admin_contact": null,
+  "email_contact": null,
+  "latitude": null,
   "location": "Bordeaux, France",
+  "longitude": null,
   "name": "Bordeaux",
-  "email_contact": null,
+  "security_contact": null,
+  "sys_admin_contact": null,
   "type": "site",
-  "uid": "bordeaux"
+  "uid": "bordeaux",
+  "user_support_contact": null,
+  "web": null
 }
\ No newline at end of file

data/grid5000/sites/bordeaux/clusters/bordemer/bordemer.json

 {
-  "type": "cluster",
-  "model": "IBM eServer 325",
   "date_of_arrival": null,
-  "uid": "bordemer",
-  "misc": "Motherboard Bios Version 1.33;IPMI version 1.5: Firware version 1.46"
+  "misc": "Motherboard Bios Version 1.33;IPMI version 1.5: Firware version 1.46",
+  "model": "IBM eServer 325",
+  "type": "cluster",
+  "uid": "bordemer"
 }
\ No newline at end of file

data/grid5000/sites/bordeaux/clusters/bordemer/nodes/bordemer-1.json

 {
-  "processor": {
-    "instruction_set": "",
-    "other_description": "",
-    "model": "AMD Opteron",
-    "cache_l1": null,
-    "cache_l1i": null,
-    "version": "248",
-    "vendor": "AMD",
-    "cache_l1d": null,
-    "clock_speed": 2200000000.0,
-    "cache_l2": 1048576
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 2
   },
-  "storage_devices": [
-    {
-      "interface": "IDE",
-      "driver": "amd74xx",
-      "size": 74505805969.2383
-    }
-  ],
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
     {
+      "enabled": true,
       "interface": "Myri-2000",
-      "version": "M3F-PCIXD-2",
-      "vendor": "Myrinet",
       "rate": 2000000000,
-      "enabled": true
+      "vendor": "Myrinet",
+      "version": "M3F-PCIXD-2"
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": true
+      "enabled": true,
+      "interface": "Ethernet",
+      "rate": 1000000000
     },
     {
-      "interface": "Ethernet",
       "driver": "tg3",
-      "rate": 1000000000,
-      "enabled": false