restructure game objects to not be nested
fixed reference error bugs