Master

Hi @thomasfay / @susanneregnell, I lost some links after the re-structuration so let me upload the modifications. Thanks.