Consolidate in one file