Drawing code moved to new namespace
Merge branch 'feature/move_drawingcode'