Moving some things around, and may have fixed the Gson issue with MCPC+