Consolidate code to one file