Moving some things around and adding Test Project.