Reorganized project, changed testing code, updated README