removed old drawing code
moved drawing code to it's own namespace