Organize modules.
Add test for mock.