Folder Organization

some slight organization modifications