Minor cleanup
Adds Circle. Restructures Lynx source folder. Removes redundancies in the load methods.