Move files to their place in the namespace

Also my "Cleaner packet log boxes" commit is stuck in the pull request...