Reorganised everything.
Final commit, framebuffer graphics have been abandoned