refactored structure to liquid/3.x standard