refactored path locations a bit