Thoughts on Restructuring Code

I realized I am currently writing the code in a Java style (a class for everything, even code that really should be static). With that in mind, I want to restructure my code from a main loop which calls Game and Graphics objects to a control system that passes a time value to an entity handler and then passes those entities into the rendering system. I think that might help me to avoid header include problems I have been having.