Path fixes, moving packets into their own dir