More refactoring, adaptions, code for new graphics system