Fixed documentation and structure