Complete overhaul of structure