Organize into separate header files.