Summary: @public Remove some of the duplicated code, move .dot files to new locations Reviewed By: @dulmarod Differential Revision: D2521709 fb-gh-sync-id: 0cc333d