Revert "Move files to their place in the namespace"

This reverts commit 60236d1a0afb28e145e09209d491de8e8e906df6.
Revert "Cleaner packet log boxes"

This reverts commit 59e57d090542931f2f8b38661356d5e625766108.