Reorganize Folders

Moved things around to clean things up