Use .ts files with explicit re-exports to solve builder conflicts

Use .ts files with explicit re-exports to solve builder conflicts #3419