style close-button
move stuff into folders