House keeping

 - Moved everythin into the Particle system class
 - Fixed intersection of circles