Particle framework update

Cleaned up framework hierarchy