Updating some of the structure
Updating some documentation