Re-organized source structure.