Moving code back; restructuring.