Updated structure
Fixed errors
Fixed errors