structural changes

preparing for improvements in graphics and optimization
structural changes cont