rearranged folders
hmm, stuff was gone
cleaned up some sloppiness