Rework Particle, Bond and Particle container to use uuids