Small changes to the drawing logic
Renamed files