Remove obsolete draw functions
Extract modules
Remove duplicate Game instance
Extract modules