Review file and directory organisation. Update doc accordingly