Reorganized Folder

Moved around files and renamed folders.