Overhaul of the structure and such
Some more changes