Minor file organizations.