Start reorganizing and adding tests.