Change folder structure.
Add some tests.