Structure clean-up

As it says...