playing with 2 bugs
Moved js into folders, fixed one draw bug