Reorganize third party files for new build rules