Tackling more namespacing issues in preparation for having central classes to help handle game updates