Reorganized code, created testing project.