Restructure project to make testing easier.