Restructured source layout.