click in app body closes window if open + added menu icon

Also restructured client folder to move everything into folders