missed some base path refactors
Merge pull request #2 from willtp87/7.x

missed some base path refactors