Simplified merging time series, cleaned up related namespaces