Consolidating some smaller files.