Jered refactoring

I moved a lot of files into folders for readability, all specs except 1 pass ,