Fixed some documentation and structure