Changed from using dictionaries to named tuples
Reformatted structures file so that it is more clean