New structure, added zend skeleton