Added Particles and renamed/rearanged some stuff