Modularization for a smooth scaling at OLX

Modularization for a smooth scaling at OLX