Reorganize directory structure and add two simple tests.