Updates of doc, file structure etc.