Header files moved to include/circle