Reorganize and stuff.