Re structure backend