Made some refractoring and added gallery-module for pucko framework