Refactoring
Refactoring. Folders
DrawCircle optimization