no more duplicate files
Merge branch 'consolidate-code'