Got tests passing for circle helpers
Got tests moved to correct location
Reorganized project