Made directory paths portable