Reorganized source layout.