Restructure modules and add more tests.