Moving stuff around a little, still need a proper makefile, but re-learning C++ has been a priority first