more consolidations and file management