More separated classes

working on infinite scroll