Reorganizing Structure

I updated the structure of everything to fit what Alex wants on the
network drive.