Full restructuration of the project
Fixing if structure
fixing for drawing
fixing for drawing