rearranged everything into folders