reorganized everything into folders