Moved things around

A lot. But it's not done.