Reorganization

-Reorganized files into various folders