moves some things around. Add two more sample tests
Merge pull request #4 from ojourmel/classpathRefactor

moves some things around. Add two more sample tests