Folder structure and more tests.