Total structue change to work with magento