Moved Particle out of Entities