Zaahir/reorganize docs