Did some basic package cleanup and moved some stuff around.
Switched all graphics to use the new GraphicsMarshal