More source code organization.