Ack, old changes and a restructure