path fixes for new repo layout