Restructured Folders

A quick cleanup of the predev folders from my local machine.