Restructure globals, remove visuals
Remove visuals
globals/definitions fix