Some C++ refactoring and setitng up for pong