reorganized files to put circle classes in the root folder