lets get this organized before we split any thing else up. (admin)
fix the tests (admin)
remove duplicate files (admin)
Merge pull request #14 from apachols/admin

lets get this organized before we split any thing else up. (admin)