reorganized into new directory structure
Merge pull request #2 from poldrack/master

reorganized into new directory structure