Cleaned up the Particle classes, sme changes in the reame