Rearranged everything into folders