Reorganized everything into folders for convenience