File structure changed to match the magento default