various file path refactors