Flatten directory structure and add a simple test.
Add 2 additional tests.