Fixing how the make works and splitting main into main and game classes