Revert "Trimmed the branch to only the rxtools sub directory"

This reverts commit 313e378cb24526ee9f1e51c3925135fa1da5595b.
Rebase from 'upstream'
Trimmed the branch to only the rxtools sub directory