Begin to consolidate files
2 files changed