refactoring
Some work on console and packets. Both are half-way there