Re-structure
Fixed misnomer