Updated dokumentation and structure