More clean up, change pathing slightly