[DF-975] and ParticleLayerLong refactoring.