Restructured Folders

Hopefully things will easier to find now.  Will have to keep it
organzied