diff --git a/doc/Blue_Book_Edition_13-Excerpt.pdf b/doc/Blue_Book_Edition_13-Excerpt.pdf
new file mode 100644
index 00000000..3b3c8030
Binary files /dev/null and b/doc/Blue_Book_Edition_13-Excerpt.pdf differ
diff --git a/doc/5512-2584_GB_A2_11-2019.OMNIPOWER.HAN.interface.specification.pdf b/doc/Denmark/5512-2584_GB_A2_11-2019.OMNIPOWER.HAN.interface.specification.pdf
similarity index 100%
rename from doc/5512-2584_GB_A2_11-2019.OMNIPOWER.HAN.interface.specification.pdf
rename to doc/Denmark/5512-2584_GB_A2_11-2019.OMNIPOWER.HAN.interface.specification.pdf
diff --git a/doc/Kamstrup_encrypted_OBIS.txt b/doc/Denmark/Kamstrup_encrypted_OBIS.txt
similarity index 100%
rename from doc/Kamstrup_encrypted_OBIS.txt
rename to doc/Denmark/Kamstrup_encrypted_OBIS.txt
diff --git a/doc/Kamstrup_encrypted_data.xml b/doc/Denmark/Kamstrup_encrypted_data.xml
similarity index 100%
rename from doc/Kamstrup_encrypted_data.xml
rename to doc/Denmark/Kamstrup_encrypted_data.xml
diff --git a/doc/Encrypted payload.png b/doc/Encrypted payload.png
new file mode 100644
index 00000000..1dc9ec77
Binary files /dev/null and b/doc/Encrypted payload.png differ
diff --git a/doc/Green_Book_Edition_9-Excerpt.pdf b/doc/Green_Book_Edition_9-Excerpt.pdf
new file mode 100644
index 00000000..bdec050e
Binary files /dev/null and b/doc/Green_Book_Edition_9-Excerpt.pdf differ
diff --git a/doc/Slimme_meter_15_a727fce1f1.pdf b/doc/Netherlands/Slimme_meter_15_a727fce1f1.pdf
similarity index 100%
rename from doc/Slimme_meter_15_a727fce1f1.pdf
rename to doc/Netherlands/Slimme_meter_15_a727fce1f1.pdf
diff --git a/doc/Aidon-HAN-Interface-Description-v10A-ID-34331.pdf b/doc/Norway/Aidon-HAN-Interface-Description-v10A-ID-34331.pdf
similarity index 100%
rename from doc/Aidon-HAN-Interface-Description-v10A-ID-34331.pdf
rename to doc/Norway/Aidon-HAN-Interface-Description-v10A-ID-34331.pdf
diff --git a/doc/Aidon-HAN-Interface-Description-v11A-ID-34331.pdf b/doc/Norway/Aidon-HAN-Interface-Description-v11A-ID-34331.pdf
similarity index 100%
rename from doc/Aidon-HAN-Interface-Description-v11A-ID-34331.pdf
rename to doc/Norway/Aidon-HAN-Interface-Description-v11A-ID-34331.pdf
diff --git a/doc/Aidon_OBIS.txt b/doc/Norway/Aidon_OBIS.txt
similarity index 100%
rename from doc/Aidon_OBIS.txt
rename to doc/Norway/Aidon_OBIS.txt
diff --git a/doc/Aidon_data.xml b/doc/Norway/Aidon_data.xml
similarity index 100%
rename from doc/Aidon_data.xml
rename to doc/Norway/Aidon_data.xml
diff --git a/doc/Kaifa HAN OBIS codes KFM_001.pdf b/doc/Norway/Kaifa HAN OBIS codes KFM_001.pdf
similarity index 100%
rename from doc/Kaifa HAN OBIS codes KFM_001.pdf
rename to doc/Norway/Kaifa HAN OBIS codes KFM_001.pdf
diff --git a/doc/Kaifa Han Codes (KFM_001).pdf b/doc/Norway/Kaifa Han Codes (KFM_001).pdf
similarity index 100%
rename from doc/Kaifa Han Codes (KFM_001).pdf
rename to doc/Norway/Kaifa Han Codes (KFM_001).pdf
diff --git a/doc/Kaifa.png b/doc/Norway/Kaifa.png
similarity index 100%
rename from doc/Kaifa.png
rename to doc/Norway/Kaifa.png
diff --git a/doc/Kamstrup HAN Module.pdf b/doc/Norway/Kamstrup HAN Module.pdf
similarity index 100%
rename from doc/Kamstrup HAN Module.pdf
rename to doc/Norway/Kamstrup HAN Module.pdf
diff --git a/doc/Kamstrup HAN-NVE interface description_rev_3_1.pdf b/doc/Norway/Kamstrup HAN-NVE interface description_rev_3_1.pdf
similarity index 100%
rename from doc/Kamstrup HAN-NVE interface description_rev_3_1.pdf
rename to doc/Norway/Kamstrup HAN-NVE interface description_rev_3_1.pdf
diff --git a/doc/NEK AMS HAN.pdf b/doc/Norway/NEK AMS HAN.pdf
similarity index 100%
rename from doc/NEK AMS HAN.pdf
rename to doc/Norway/NEK AMS HAN.pdf
diff --git a/doc/NVE_Info_kunder_HANgrensesnitt.pdf b/doc/Norway/NVE_Info_kunder_HANgrensesnitt.pdf
similarity index 100%
rename from doc/NVE_Info_kunder_HANgrensesnitt.pdf
rename to doc/Norway/NVE_Info_kunder_HANgrensesnitt.pdf
diff --git a/doc/OBIS List Information - AIDON.pdf b/doc/Norway/OBIS List Information - AIDON.pdf
similarity index 100%
rename from doc/OBIS List Information - AIDON.pdf
rename to doc/Norway/OBIS List Information - AIDON.pdf
diff --git a/doc/OBIS List Information - KAMSTRUP.pdf b/doc/Norway/OBIS List Information - KAMSTRUP.pdf
similarity index 100%
rename from doc/OBIS List Information - KAMSTRUP.pdf
rename to doc/Norway/OBIS List Information - KAMSTRUP.pdf
diff --git a/doc/Aidon-RJ12.pdf b/doc/Sweden/Aidon-RJ12.pdf
similarity index 100%
rename from doc/Aidon-RJ12.pdf
rename to doc/Sweden/Aidon-RJ12.pdf