fix for drawing toolbar
reorder project structure