Major file restructuring.